| commit | 3aef81f128c91b6ecf1b68ca74ce052a8938af64 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 May 2010 05:40:04 +0000 (18 22:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 May 2010 05:40:04 +0000 (18 22:40 -0700) | ||
| tree | 10bb1952d4aa1fd847acf54a4643414e409e006a | treesnapshot (tar.gz zip) |
| parent | 7d1e8fef7ffce7fe8e9fa8fae99aaa15468fb6d3 | commitdiff |
| parent | 636e87d705c2d6cc53d58eac31b689779d00b292 | commitdiff |
Merge branch 'master' into next
* master:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
diff-options: make --patch a synonym for -p
for-each-ref: Field with abbreviated objectname
hash_object: correction for zero length file
gitweb: Use @diff_opts while using format-patch
* master:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
diff-options: make --patch a synonym for -p
for-each-ref: Field with abbreviated objectname
hash_object: correction for zero length file
gitweb: Use @diff_opts while using format-patch