]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: afb5f39 41728d6)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 24 Apr 2007 07:08:16 +0000 (00:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 24 Apr 2007 07:08:16 +0000 (00:08 -0700)
commit520d7e278cfd25057e883575060b7378dfab61dc
tree3f20d1056ba4a3e1de652e25d32f2736395a8e2btree | snapshot
parentafb5f39e24eadc5933b34cfd17c1089e482d6a6bcommit | diff
parent41728d69426dd707d4978929f8f4ac7a16f115f3commit | diff
Merge branch 'maint'

* maint:
  Documentation/git-reset.txt: suggest git commit --amend in example.
  Build RPM with ETC_GITCONFIG=/etc/gitconfig
  Ignore all man sections as they are generated files.
  Fix typo in git-am: s/Was is/Was it/
  Reverse the order of -b and --track in the man page.
  dir.c(common_prefix): Fix two bugs

Conflicts:

git.spec.in
dir.c diff1 | diff2 | blob | history
git.spec.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.