Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remote: 'show' and 'prune' can take more than one remote | Thomas Rast | 2013-04-24 | 2 | -10/+5 |
* | remote: check for superfluous arguments in 'git remote add' | Thomas Rast | 2013-04-24 | 2 | -2/+2 |
* | remote: add a test for extra arguments, according to docs | Thomas Rast | 2013-04-24 | 1 | -0/+27 |
* | Start preparing for 1.8.2.2 | Junio C Hamano | 2013-04-22 | 2 | -1/+26 |
* | Merge branch 'ta/glossary' into maint | Junio C Hamano | 2013-04-22 | 32 | -111/+89 |
|\ | |||||
| * | glossary: improve definitions of refspec and pathspec | Thomas Ackermann | 2013-04-15 | 1 | -23/+10 |
| * | The name of the hash function is "SHA-1", not "SHA1" | Thomas Ackermann | 2013-04-15 | 31 | -68/+68 |
| * | glossary: improve description of SHA-1 related topics | Thomas Ackermann | 2013-04-15 | 1 | -10/+10 |
| * | glossary: remove outdated/misleading/irrelevant entries | Thomas Ackermann | 2013-04-15 | 1 | -10/+1 |
* | | Merge branch 'jk/doc-http-backend' into maint | Junio C Hamano | 2013-04-22 | 3 | -1/+129 |
|\ \ | |||||
| * | | doc/http-backend: match query-string in apache half-auth example | Jeff King | 2013-04-14 | 3 | -8/+72 |
| * | | doc/http-backend: give some lighttpd config examples | Jeff King | 2013-04-11 | 1 | -0/+55 |
| * | | doc/http-backend: clarify "half-auth" repo configuration | Jeff King | 2013-04-11 | 1 | -0/+9 |
* | | | Merge branch 'jk/test-trash' into maint | Junio C Hamano | 2013-04-22 | 1 | -9/+9 |
|\ \ \ | |||||
| * | | | t/test-lib.sh: drop "$test" variable | Jeff King | 2013-04-15 | 1 | -5/+5 |
| * | | | t/test-lib.sh: fix TRASH_DIRECTORY handling | John Keeping | 2013-04-15 | 1 | -4/+4 |
| | |/ | |/| | |||||
* | | | 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-07 | 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-04-01 | 1 | -0/+2 |
* | | | | | | | | | | remote-hg: fix commit messages | Felipe Contreras | 2013-04-18 | 1 | -1/+2 |
* | | | | | | | | | | help.c: add a compatibility comment to cmd_version() | David Aguilar | 2013-04-17 | 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-04 | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |