summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-061-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-03-311-0/+2
* | | | | | | | remote-hg: fix commit messagesFelipe Contreras2013-04-171-1/+2
* | | | | | | | help.c: add a compatibility comment to cmd_version()David Aguilar2013-04-161-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-031-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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Documentation/git-commit: reword the --amend explanationCarlos Martín Nieto2013-04-051-8/+9
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/bisect-prn-unsigned' into maintJunio C Hamano2013-04-121-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bisect: avoid signed integer overflowJohn Keeping2013-04-031-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/no-more-self-assignment' into maintJunio C Hamano2013-04-122-47/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | match-trees: simplify score_trees() using tree_entry()René Scharfe2013-03-251-40/+28
| * | | | | | | | | submodule: clarify logic in show_submodule_summaryJeff King2013-03-221-7/+6
* | | | | | | | | | Merge branch 'rr/send-email-perl-critique' into maintJunio C Hamano2013-04-121-8/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: use the three-arg form of open in recipients_cmdRamkumar Ramachandra2013-03-311-1/+1
| * | | | | | | | | | send-email: drop misleading function prototypeRamkumar Ramachandra2013-03-311-4/+6
| * | | | | | | | | | send-email: use "return;" not "return undef;" on error codepathsRamkumar Ramachandra2013-03-311-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maintJunio C Hamano2013-04-121-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5516: test interaction between pushURL and pushInsteadOf correctlyJunio C Hamano2013-03-281-3/+3
* | | | | | | | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-1224-33/+33
* | | | | | | | | | | kwset: fix spelling in commentsStefano Lattarini2013-04-121-2/+2
* | | | | | | | | | | precompose-utf8: fix spelling of "want" in error messageStefano Lattarini2013-04-121-1/+1
* | | | | | | | | | | compat/nedmalloc: fix spelling in commentsStefano Lattarini2013-04-121-3/+3