Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/clone-recurse-sm-synonym' | Junio C Hamano | 2010-11-30 | 1 | -1/+3 |
|\ | |||||
| * | clone: Add the --recurse-submodules option as alias for --recursive | Jens Lehmann | 2010-11-05 | 1 | -1/+3 |
* | | Merge branch 'kb/blame-author-email' | Junio C Hamano | 2010-11-30 | 1 | -1/+5 |
|\ \ | |||||
| * | | blame: Add option to show author email instead of name | Kevin Ballard | 2010-10-19 | 1 | -1/+5 |
* | | | Merge branch 'ao/send-email-irt' | Junio C Hamano | 2010-11-25 | 1 | -5/+20 |
|\ \ \ | |||||
| * | | | git-send-email.perl: make initial In-Reply-To apply only to first email | Antonio Ospite | 2010-11-12 | 1 | -5/+20 |
* | | | | Merge branch 'jk/add-e-doc' | Junio C Hamano | 2010-11-25 | 1 | -3/+77 |
|\ \ \ \ | |||||
| * | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-11-10 | 1 | -28/+76 |
| * | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-10-22 | 1 | -3/+29 |
* | | | | | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-25 | 2 | -3/+10 |
|\ \ \ \ \ | |||||
| * | | | | | verify-tag: document --verbose | René Scharfe | 2010-11-15 | 1 | -0/+4 |
| * | | | | | add OPT__FORCE | René Scharfe | 2010-11-15 | 1 | -0/+3 |
| * | | | | | add description parameter to OPT__QUIET | René Scharfe | 2010-11-15 | 1 | -1/+1 |
| * | | | | | add description parameter to OPT__DRY_RUN | René Scharfe | 2010-11-15 | 1 | -1/+1 |
| * | | | | | add description parameter to OPT__VERBOSE | René Scharfe | 2010-11-15 | 1 | -1/+1 |
* | | | | | | Merge branch 'mm/phrase-remote-tracking' | Junio C Hamano | 2010-11-25 | 18 | -59/+79 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-branch.txt: mention --set-upstream as a way to change upstream configuration | Matthieu Moy | 2010-11-03 | 1 | -1/+2 |
| * | | | | | | user-manual: remote-tracking can be checked out, with detached HEAD | Jonathan Nieder | 2010-11-03 | 1 | -2/+5 |
| * | | | | | | user-manual.txt: explain better the remote(-tracking) branch terms | Matthieu Moy | 2010-11-03 | 1 | -3/+16 |
| * | | | | | | Change incorrect uses of "remote branch" meaning "remote-tracking" | Matthieu Moy | 2010-11-03 | 6 | -15/+18 |
| * | | | | | | Change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 7 | -20/+20 |
| * | | | | | | everyday.txt: change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 1 | -3/+3 |
| * | | | | | | Change remote tracking to remote-tracking in non-trivial places | Matthieu Moy | 2010-11-03 | 2 | -5/+5 |
| * | | | | | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 8 | -9/+9 |
| * | | | | | | Better "Changed but not updated" message in git-status | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'ef/mingw-daemon' | Junio C Hamano | 2010-11-24 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | daemon: make --inetd and --detach incompatible | Erik Faye-Lund | 2010-11-05 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Update draft release notes to 1.7.4 | Junio C Hamano | 2010-11-18 | 1 | -2/+53 |
* | | | | | | Merge branch 'jl/maint-pull-tags-doc' | Junio C Hamano | 2010-11-18 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: Remove --tags option from manpage | Jens Lehmann | 2010-11-03 | 1 | -0/+2 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-11-17 | 4 | -20/+63 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Documentation/git-pull: clarify configuration | Martin von Zweigbergk | 2010-11-17 | 1 | -6/+8 |
| * | | | | | | Document that rev-list --graph triggers parent rewriting. | Yann Dirson | 2010-11-17 | 1 | -0/+2 |
| * | | | | | | document sigchain api | Jeff King | 2010-11-16 | 1 | -0/+41 |
| * | | | | | | Keep together options controlling the behaviour of diffcore-rename. | Yann Dirson | 2010-11-16 | 1 | -14/+12 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-11-09 | 2 | -0/+7 |
|\| | | | | | | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Documentation: document show -s | Jonathan Nieder | 2010-11-09 | 2 | -0/+7 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-11-05 | 1 | -7/+7 |
|\| | | | | | |_|/ / / |/| | | | | |||||
| * | | | | Fix a formatting error in git-merge.txt | Nathan W. Panike | 2010-10-29 | 1 | -7/+7 |
| |/ / / | |||||
* | | | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-27 | 2 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | diff: add synonyms for -M, -C, -B | Kevin Ballard | 2010-09-29 | 1 | -0/+3 |
| * | | | | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -0/+4 |
* | | | | | Merge branch 'jp/send-email-to-cmd' | Junio C Hamano | 2010-10-27 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | git-send-email.perl: Add --to-cmd | Joe Perches | 2010-09-27 | 1 | -1/+7 |
* | | | | | | Merge branch 'as/daemon-multi-listen' | Junio C Hamano | 2010-10-27 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | daemon: allow more than one host address given via --listen | Alexander Sulfrian | 2010-09-28 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-27 | 2 | -20/+73 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | merge-recursive: options to ignore whitespace changes | Justin Frankel | 2010-08-27 | 1 | -0/+15 |
| * | | | | | | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+7 |
| * | | | | | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -20/+51 |