summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-242-10/+5
* remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-242-2/+2
* remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* Start preparing for 1.8.2.2Junio C Hamano2013-04-222-1/+26
* Merge branch 'ta/glossary' into maintJunio C Hamano2013-04-2232-111/+89
|\
| * glossary: improve definitions of refspec and pathspecThomas Ackermann2013-04-151-23/+10
| * The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-1531-68/+68
| * glossary: improve description of SHA-1 related topicsThomas Ackermann2013-04-151-10/+10
| * glossary: remove outdated/misleading/irrelevant entriesThomas Ackermann2013-04-151-10/+1
* | Merge branch 'jk/doc-http-backend' into maintJunio C Hamano2013-04-223-1/+129
|\ \
| * | doc/http-backend: match query-string in apache half-auth exampleJeff King2013-04-143-8/+72
| * | doc/http-backend: give some lighttpd config examplesJeff King2013-04-111-0/+55
| * | doc/http-backend: clarify "half-auth" repo configurationJeff King2013-04-111-0/+9
* | | Merge branch 'jk/test-trash' into maintJunio C Hamano2013-04-221-9/+9
|\ \ \
| * | | t/test-lib.sh: drop "$test" variableJeff King2013-04-151-5/+5
| * | | t/test-lib.sh: fix TRASH_DIRECTORY handlingJohn Keeping2013-04-151-4/+4
| | |/ | |/|
* | | Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano2013-04-221-0/+7
|\ \ \
| * | | doc: clarify that "git daemon --user=<user>" option does not export HOME=~userJunio C Hamano2013-04-121-0/+7
* | | | Merge branch 'jc/detached-head-doc' into maintJunio C Hamano2013-04-221-3/+16
|\ \ \ \
| * | | | glossary: extend "detached HEAD" descriptionJunio C Hamano2013-04-051-3/+16
* | | | | Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-221-9/+8
|\ \ \ \ \
| * | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-071-9/+8
* | | | | | Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2013-04-222-10/+36
|\ \ \ \ \ \
| * | | | | | rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-042-8/+20
| * | | | | | rerere forget: grok files containing NULJohannes Sixt2013-04-022-2/+16
| |/ / / / /
* | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-224-7/+41
|\ \ \ \ \ \
| * | | | | | test: resurrect q_to_tabJunio C Hamano2013-03-291-0/+4
| * | | | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-224-9/+39
| |/ / / / /
* | | | | | Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2013-04-222-7/+161
|\ \ \ \ \ \
| * | | | | | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-142-7/+161
* | | | | | | Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2013-04-222-2/+4
|\ \ \ \ \ \ \
| * | | | | | | fix clang -Wtautological-compare with unsigned enumAntoine Pelisse2013-02-252-2/+4
* | | | | | | | Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2013-04-222-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | t9700: do not close STDERRThomas Rast2013-04-041-1/+2
| * | | | | | | | perl: redirect stderr to /dev/null instead of closingThomas Rast2013-04-041-3/+3
* | | | | | | | | Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2013-04-222-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bundle: Accept prerequisites without commit messagesLukas Fleischer2013-04-072-1/+11
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2013-04-222-2/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | filter-branch: return to original dir after filteringJeff King2013-04-022-2/+17
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano2013-04-221-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bash: teach __git_ps1 about REVERT_HEADRobin Rosenberg2013-04-011-0/+2
* | | | | | | | | | remote-hg: fix commit messagesFelipe Contreras2013-04-181-1/+2
* | | | | | | | | | help.c: add a compatibility comment to cmd_version()David Aguilar2013-04-171-0/+4
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch 'rr/test-3200-style' into maintJunio C Hamano2013-04-121-253/+267
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3200 (branch): modernize styleRamkumar Ramachandra2013-03-201-233/+244
* | | | | | | | | | Merge branch 'mg/texinfo-5' into maintJunio C Hamano2013-04-121-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: Strip texinfo anchors to avoid duplicatesMartin von Gagern2013-04-041-0/+1
* | | | | | | | | | | Merge branch 'jk/diffcore-break-divzero' into maintJunio C Hamano2013-04-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diffcore-break: don't divide by zeroJohn Keeping2013-04-031-0/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cn/commit-amend-doc' into maintJunio C Hamano2013-04-121-8/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |