Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/daemon-user-doc' into maint | Junio C Hamano | 2013-04-22 | 1 | -0/+7 |
|\ | |||||
| * | doc: clarify that "git daemon --user=<user>" option does not export HOME=~user | Junio C Hamano | 2013-04-12 | 1 | -0/+7 |
* | | Merge branch 'jc/detached-head-doc' into maint | Junio C Hamano | 2013-04-22 | 1 | -3/+16 |
|\ \ | |||||
| * | | glossary: extend "detached HEAD" description | Junio C Hamano | 2013-04-05 | 1 | -3/+16 |
* | | | Merge branch 'jk/show-branch-strbuf' into maint | Junio C Hamano | 2013-04-22 | 1 | -9/+8 |
|\ \ \ | |||||
| * | | | show-branch: use strbuf instead of static buffer | Jeff King | 2013-04-06 | 1 | -9/+8 |
* | | | | Merge branch 'js/rerere-forget-protect-against-NUL' into maint | Junio C Hamano | 2013-04-22 | 2 | -10/+36 |
|\ \ \ \ | |||||
| * | | | | rerere forget: do not segfault if not all stages are present | Johannes Sixt | 2013-04-04 | 2 | -8/+20 |
| * | | | | rerere forget: grok files containing NUL | Johannes Sixt | 2013-04-02 | 2 | -2/+16 |
| |/ / / | |||||
* | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint | Junio C Hamano | 2013-04-22 | 4 | -7/+41 |
|\ \ \ \ | |||||
| * | | | | test: resurrect q_to_tab | Junio C Hamano | 2013-03-29 | 1 | -0/+4 |
| * | | | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 4 | -9/+39 |
| |/ / / | |||||
* | | | | Merge branch 'ap/combine-diff-ignore-whitespace' into maint | Junio C Hamano | 2013-04-22 | 2 | -7/+161 |
|\ \ \ \ | |||||
| * | | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 | 2 | -7/+161 |
* | | | | | Merge branch 'jk/suppress-clang-warning' into maint | Junio C Hamano | 2013-04-22 | 2 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | fix clang -Wtautological-compare with unsigned enum | Antoine Pelisse | 2013-02-25 | 2 | -2/+4 |
* | | | | | | Merge branch 'tr/perl-keep-stderr-open' into maint | Junio C Hamano | 2013-04-22 | 2 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9700: do not close STDERR | Thomas Rast | 2013-04-04 | 1 | -1/+2 |
| * | | | | | | perl: redirect stderr to /dev/null instead of closing | Thomas Rast | 2013-04-04 | 1 | -3/+3 |
* | | | | | | | Merge branch 'lf/bundle-with-tip-wo-message' into maint | Junio C Hamano | 2013-04-22 | 2 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bundle: Accept prerequisites without commit messages | Lukas Fleischer | 2013-04-07 | 2 | -1/+11 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/filter-branch-come-back-to-original' into maint | Junio C Hamano | 2013-04-22 | 2 | -2/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | filter-branch: return to original dir after filtering | Jeff King | 2013-04-02 | 2 | -2/+17 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rr/prompt-revert-head' into maint | Junio C Hamano | 2013-04-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bash: teach __git_ps1 about REVERT_HEAD | Robin Rosenberg | 2013-03-31 | 1 | -0/+2 |
* | | | | | | | | remote-hg: fix commit messages | Felipe Contreras | 2013-04-17 | 1 | -1/+2 |
* | | | | | | | | help.c: add a compatibility comment to cmd_version() | David Aguilar | 2013-04-16 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'rr/test-3200-style' into maint | Junio C Hamano | 2013-04-12 | 1 | -253/+267 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3200 (branch): modernize style | Ramkumar Ramachandra | 2013-03-20 | 1 | -233/+244 |
* | | | | | | | | | Merge branch 'mg/texinfo-5' into maint | Junio C Hamano | 2013-04-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: Strip texinfo anchors to avoid duplicates | Martin von Gagern | 2013-04-03 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'jk/diffcore-break-divzero' into maint | Junio C Hamano | 2013-04-12 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | diffcore-break: don't divide by zero | John Keeping | 2013-04-03 | 1 | -0/+3 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cn/commit-amend-doc' into maint | Junio C Hamano | 2013-04-12 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Documentation/git-commit: reword the --amend explanation | Carlos Martín Nieto | 2013-04-05 | 1 | -8/+9 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/bisect-prn-unsigned' into maint | Junio C Hamano | 2013-04-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | bisect: avoid signed integer overflow | John Keeping | 2013-04-03 | 1 | -2/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/no-more-self-assignment' into maint | Junio C Hamano | 2013-04-12 | 2 | -47/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | match-trees: simplify score_trees() using tree_entry() | René Scharfe | 2013-03-25 | 1 | -40/+28 |
| * | | | | | | | | | submodule: clarify logic in show_submodule_summary | Jeff King | 2013-03-22 | 1 | -7/+6 |
* | | | | | | | | | | Merge branch 'rr/send-email-perl-critique' into maint | Junio C Hamano | 2013-04-12 | 1 | -8/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: use the three-arg form of open in recipients_cmd | Ramkumar Ramachandra | 2013-03-31 | 1 | -1/+1 |
| * | | | | | | | | | | send-email: drop misleading function prototype | Ramkumar Ramachandra | 2013-03-31 | 1 | -4/+6 |
| * | | | | | | | | | | send-email: use "return;" not "return undef;" on error codepaths | Ramkumar Ramachandra | 2013-03-31 | 1 | -3/+3 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint | Junio C Hamano | 2013-04-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5516: test interaction between pushURL and pushInsteadOf correctly | Junio C Hamano | 2013-03-28 | 1 | -3/+3 |
* | | | | | | | | | | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 24 | -33/+33 |
* | | | | | | | | | | | kwset: fix spelling in comments | Stefano Lattarini | 2013-04-12 | 1 | -2/+2 |
* | | | | | | | | | | | precompose-utf8: fix spelling of "want" in error message | Stefano Lattarini | 2013-04-12 | 1 | -1/+1 |
* | | | | | | | | | | | compat/nedmalloc: fix spelling in comments | Stefano Lattarini | 2013-04-12 | 1 | -3/+3 |