diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
| commit | 520d7e278cfd25057e883575060b7378dfab61dc (patch) | |
| tree | 3f20d1056ba4a3e1de652e25d32f2736395a8e2b /builtin-grep.c | |
| parent | afb5f39e24eadc5933b34cfd17c1089e482d6a6b (diff) | |
| parent | 41728d69426dd707d4978929f8f4ac7a16f115f3 (diff) | |
| download | git-520d7e278cfd25057e883575060b7378dfab61dc.tar.gz git-520d7e278cfd25057e883575060b7378dfab61dc.tar.xz | |
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
Diffstat (limited to 'builtin-grep.c')
0 files changed, 0 insertions, 0 deletions