sirnot

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

diff -B: colour whitespace errors

diff.c: emit_add_line() takes only the rest of the line

diff.c: split emit_line() from the first char and the rest of the line

diff.c: shuffling code around

diff --whitespace: fix blank lines at end

gitweb: Add 'show-sizes' feature to show blob sizes in tree view

core.whitespace: split trailing-space into blank-at-{eol,eof}

diff --color: color blank-at-eof

diff --whitespace=warn/error: fix blank-at-eof check

diff --whitespace=warn/error: obey blank-at-eof

diff.c: the builtin_diff() deals with only two-file comparison

apply --whitespace: warn blank but not necessarily empty lines at EOF

apply --whitespace=warn/error: diagnose blank at EOF

apply.c: split check_whitespace() into two

apply --whitespace=fix: detect new blank lines at eof correctly

apply --whitespace=fix: fix handling of blank lines at the eof

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'

tests: disable interactive hunk selection tests if perl is not available

DWIM 'git stash save -p' for 'git stash -p'

Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

Implement 'git stash save --patch'

Implement 'git checkout --patch'

Implement 'git reset --patch'

builtin-add: refactor the meat of interactive_add()

Add a small patch-mode testing library

git-apply--interactive: Refactor patch mode code

gitk: Update Swedish translation (280t0f0u)

Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible

Makefile: do not link three copies of git-remote-* programs

Makefile: git-http-fetch does not need expat

http-fetch: Fix Makefile dependancies

Add transport native helper executables to .gitignore

git-http-fetch: not a builtin

Use an external program to implement fetching with curl

Add support for external programs for handling native fetches

Make 'git stash -k' a short form for 'git stash save --keep-index'