| commit | 4eddac518225621c3e4f7285beb879d2b4bad38a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 04:42:43 +0000 (8 21:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 04:42:43 +0000 (8 21:42 -0700) | ||
| tree | 59bf79a7a2440381dfe165ae49785fbaa9b14b16 | treesnapshot (tar.gz zip) |
| parent | d3ec381f7733f3e36afd29599d8e06e8218edead | commitdiff |
| parent | 1f8115b113def8ee03701aa87b26c5e8b7c94434 | commitdiff |
Merge branch 'master' into next
* master:
compat-util: avoid macro redefinition warning
compat/fopen.c: avoid clobbering the system defined fopen macro
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
Documentation: bisect: add a few "git bisect run" examples
Documentation/config.txt: Add git-gui options
Documentation: improve "add", "pull" and "format-patch" examples
Be more careful with objects directory permissions on clone
* master:
compat-util: avoid macro redefinition warning
compat/fopen.c: avoid clobbering the system defined fopen macro
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
Documentation: bisect: add a few "git bisect run" examples
Documentation/config.txt: Add git-gui options
Documentation: improve "add", "pull" and "format-patch" examples
Be more careful with objects directory permissions on clone
| Documentation/git-bisect.txt | diff1 | diff2 | blobhistory |
| Documentation/git-format-patch.txt | diff1 | diff2 | blobhistory |