| commit | 1880e5287d82bd5e6ee471df09b9916ba195935d | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Mon, 18 Dec 2006 09:38:04 +0000 (18 10:38 +0100) | ||
| committer | Jakub Narebski <jnareb@gmail.com> | |
| Mon, 18 Dec 2006 09:38:04 +0000 (18 10:38 +0100) | ||
| tree | 4a62e157d58a3d12f0b82d517408bd6696eeaaa6 | treesnapshot (tar.gz zip) |
| parent | 52220b98f1bae52f75377de2d57af94c96f969bd | commitdiff |
| parent | ee6002aa429272871733b8fbc99a9e6df3e150f5 | commitdiff |
Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git:
markup fix in svnimport documentation.
Documentation: new option -P for git-svnimport
Fix mis-mark-up in git-merge-file.txt documentation
Default GIT_COMMITTER_NAME to login name in recieve-pack.
Fix check_file_directory_conflict().
git-add: remove conflicting entry when adding.
update-index: make D/F conflict error a bit more verbose.
* 'master' of git://git.kernel.org/pub/scm/git/git:
markup fix in svnimport documentation.
Documentation: new option -P for git-svnimport
Fix mis-mark-up in git-merge-file.txt documentation
Default GIT_COMMITTER_NAME to login name in recieve-pack.
Fix check_file_directory_conflict().
git-add: remove conflicting entry when adding.
update-index: make D/F conflict error a bit more verbose.