diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
| commit | 556c5e030f17efb412a192a430fe9027840ed718 (patch) | |
| tree | 1600c629829c2b1f029af13da527c3380b25c5e7 | |
| parent | 85551232b56e763ecfcc7222e0858bac4e962c80 (diff) | |
| parent | 0dbe6592ccbd1a394a69a52074e3729d546fe952 (diff) | |
| download | git-556c5e030f17efb412a192a430fe9027840ed718.tar.gz | |
Merge branch 'maint'
By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
| -rw-r--r-- | Documentation/diff-options.txt | 3 | ||||
| -rwxr-xr-x | t/t5704-bundle.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9f7cba2be6..ba7cd13483 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -52,6 +52,9 @@ endif::git-format-patch[] --patience:: Generate a diff using the "patience diff" algorithm. +--histogram:: + Generate a diff using the "histogram diff" algorithm. + --stat[=<width>[,<name-width>[,<count>]]]:: Generate a diffstat. You can override the default output width for 80-column terminal by `--stat=<width>`. diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index a51c8b0560..9e43731fe5 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -54,8 +54,8 @@ test_expect_success 'ridiculously long subject in boundary' ' git bundle list-heads long-subject-bundle.bdl >heads && test -s heads && git fetch long-subject-bundle.bdl && - sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary && - grep "^-$_x40 " boundary + sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary && + grep "^-[0-9a-f]\\{40\\} " boundary ' test_done |