| commit | f9c6923ab69ebc5b6ac58d3bd092bb615006aafb | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 16 Dec 2011 11:29:40 +0000 (16 05:29 -0600) | ||
| committer | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 16 Dec 2011 11:29:40 +0000 (16 05:29 -0600) | ||
| tree | e3d7554e800bbd5918721c08a6eafb02261f31a0 | treesnapshot (tar.gz zip) |
| parent | 68901d569e39b8cf4bbb5c9892dfec42ffb52b58 | commitdiff |
| parent | 406da7803217998ff6bf5dc69c55b1613556c2f4 | commitdiff |
Merge commit 'v1.7.8' into debian-sid
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
| Documentation/git.txt | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |