summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* status: show branchname with a configurable colorAleksi Aalto2010-11-291-1/+2
* Merge branch 'ao/send-email-irt'Junio C Hamano2010-11-241-5/+20
|\
| * git-send-email.perl: make initial In-Reply-To apply only to first emailAntonio Ospite2010-11-121-5/+20
* | Merge branch 'jk/add-e-doc'Junio C Hamano2010-11-241-3/+77
|\ \
| * | docs: give more hints about how "add -e" worksJeff King2010-11-091-28/+76
| * | docs: give more hints about how "add -e" worksJeff King2010-10-211-3/+29
* | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-242-3/+10
|\ \ \
| * | | verify-tag: document --verboseRené Scharfe2010-11-151-0/+4
| * | | add OPT__FORCERené Scharfe2010-11-151-0/+3
| * | | add description parameter to OPT__QUIETRené Scharfe2010-11-151-1/+1
| * | | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-151-1/+1
| * | | add description parameter to OPT__VERBOSERené Scharfe2010-11-151-1/+1
* | | | Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-2418-59/+79
|\ \ \ \
| * | | | git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy2010-11-031-1/+2
| * | | | user-manual: remote-tracking can be checked out, with detached HEADJonathan Nieder2010-11-031-2/+5
| * | | | user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy2010-11-031-3/+16
| * | | | Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy2010-11-036-15/+18
| * | | | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-037-20/+20
| * | | | everyday.txt: change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-031-3/+3
| * | | | Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy2010-11-032-5/+5
| * | | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-038-9/+9
| * | | | Better "Changed but not updated" message in git-statusMatthieu Moy2010-11-031-1/+1
* | | | | Merge branch 'ef/mingw-daemon'Junio C Hamano2010-11-231-1/+2
|\ \ \ \ \
| * | | | | daemon: make --inetd and --detach incompatibleErik Faye-Lund2010-11-041-1/+2
| |/ / / /
* | | | | Update draft release notes to 1.7.4Junio C Hamano2010-11-171-2/+53
* | | | | Merge branch 'jl/maint-pull-tags-doc'Junio C Hamano2010-11-171-0/+2
|\ \ \ \ \
| * | | | | pull: Remove --tags option from manpageJens Lehmann2010-11-031-0/+2
* | | | | | Merge branch 'maint'Junio C Hamano2010-11-174-20/+63
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Documentation/git-pull: clarify configurationMartin von Zweigbergk2010-11-171-6/+8
| * | | | | Document that rev-list --graph triggers parent rewriting.Yann Dirson2010-11-171-0/+2
| * | | | | document sigchain apiJeff King2010-11-161-0/+41
| * | | | | Keep together options controlling the behaviour of diffcore-rename.Yann Dirson2010-11-161-14/+12
* | | | | | Merge branch 'maint'Junio C Hamano2010-11-092-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Documentation: document show -sJonathan Nieder2010-11-092-0/+7
* | | | | Merge branch 'maint'Junio C Hamano2010-11-051-7/+7
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Fix a formatting error in git-merge.txtNathan W. Panike2010-10-291-7/+7
| |/ /
* | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-262-0/+7
|\ \ \
| * | | diff: add synonyms for -M, -C, -BKevin Ballard2010-09-291-0/+3
| * | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+4
* | | | Merge branch 'jp/send-email-to-cmd'Junio C Hamano2010-10-261-1/+7
|\ \ \ \
| * | | | git-send-email.perl: Add --to-cmdJoe Perches2010-09-271-1/+7
* | | | | Merge branch 'as/daemon-multi-listen'Junio C Hamano2010-10-261-0/+1
|\ \ \ \ \
| * | | | | daemon: allow more than one host address given via --listenAlexander Sulfrian2010-09-281-0/+1
* | | | | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-262-20/+73
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-271-0/+15
| * | | | | merge-recursive --patienceJustin Frankel2010-08-261-0/+7
| * | | | | ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-20/+51
* | | | | | Merge branch 'po/sendemail'Junio C Hamano2010-10-262-0/+10
|\ \ \ \ \ \
| * | | | | | New send-email option smtpserveroption.Pascal Obry2010-09-062-0/+10
* | | | | | | Sync with 1.7.3.2Junio C Hamano2010-10-2135-117/+123
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |