![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 May 2010 05:39:56 +0000 (22:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 May 2010 05:39:56 +0000 (22:39 -0700) | ||
| commit | 636e87d705c2d6cc53d58eac31b689779d00b292 | |
| tree | a3de44b428a21e7bbcae6099a903e77fc9c9db16 | tree | snapshot |
| parent | 1c9eecff97beab2d425397dc624281dff5c0be5c | commit | diff |
| parent | d07ef715757ab1c2436c59adca92484fa46b2b41 | commit | diff |
Merge branch 'maint'
* maint:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
hash_object: correction for zero length file
* maint:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
hash_object: correction for zero length file
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| sha1_file.c | diff1 | | diff2 | | blob | history |