Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
* | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 2013-07-02 | 1 | -3/+9 |
* | Merge branch 'maint' | Junio C Hamano | 2013-06-30 | 1 | -2/+2 |
|\ | |||||
| * | test: spell 'ls-files --delete' option correctly in test descriptions | SZEDER Gábor | 2013-06-30 | 1 | -2/+2 |
| * | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint | Junio C Hamano | 2013-06-28 | 1 | -0/+7 |
| |\ | |||||
| * \ | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+19 |
| |\ \ | |||||
| * \ \ | Merge branch 'fc/show-branch-in-rebase-am' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/commit-m-no-edit' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+17 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/strbuf-branchname-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -2/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mk/combine-diff-context-horizon-fix' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+48 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'kb/ancestry-path-threedots' into maint | Junio C Hamano | 2013-06-27 | 1 | -1/+20 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mh/fetch-into-shallow' into maint | Junio C Hamano | 2013-06-27 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jh/checkout-auto-tracking' into maint | Junio C Hamano | 2013-06-27 | 4 | -5/+173 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'ap/diff-ignore-blank-lines' | Junio C Hamano | 2013-06-30 | 1 | -0/+345 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 | 1 | -0/+345 |
* | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-06-30 | 6 | -173/+538 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | submodule: drop the top-level requirement | John Keeping | 2013-06-17 | 5 | -0/+219 |
| * | | | | | | | | | | | | rev-parse: add --prefix option | John Keeping | 2013-06-17 | 1 | -0/+96 |
| * | | | | | | | | | | | | t7403: add missing && chaining | John Keeping | 2013-06-17 | 1 | -2/+2 |
| * | | | | | | | | | | | | t7403: modernize style | John Keeping | 2013-06-17 | 1 | -133/+183 |
| * | | | | | | | | | | | | t7401: make indentation consistent | John Keeping | 2013-06-17 | 1 | -40/+40 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'mt/send-email-cc-match-fix' | Junio C Hamano | 2013-06-27 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | send-email: sanitize author when writing From line | Michael S. Tsirkin | 2013-06-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | send-email: add test for duplicate utf8 name | Michael S. Tsirkin | 2013-06-20 | 1 | -0/+14 |
* | | | | | | | | | | | | | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 2013-06-27 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 2013-06-20 | 1 | -0/+29 |
* | | | | | | | | | | | | | | Merge branch 'bc/checkout-tracking-name-plug-leak' | Junio C Hamano | 2013-06-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t/t9802: explicitly name the upstream branch to use as a base | Brandon Casey | 2013-06-18 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | Merge branch 'rr/rebase-stash-store' | Junio C Hamano | 2013-06-27 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | stash: introduce 'git stash store' | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+19 |
* | | | | | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 2013-06-26 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | Merge branch 'vl/typofix' | Junio C Hamano | 2013-06-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-non-ascii-path' | Junio C Hamano | 2013-06-26 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t7400: test of UTF-8 submodule names pass under Mac OS | Torsten Bögershausen | 2013-06-20 | 1 | -8/+11 |
| * | | | | | | | | | | | | | | | | | handle multibyte characters in name | Fredrik Gustafsson | 2013-06-14 | 1 | -0/+12 |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix' | Junio C Hamano | 2013-06-24 | 1 | -17/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t/am: use test_path_is_missing() where appropriate | Ramkumar Ramachandra | 2013-06-17 | 1 | -17/+17 |
| * | | | | | | | | | | | | | | | | | am: handle stray $dotest directory | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+6 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status' | Junio C Hamano | 2013-06-24 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | wt-status: give better advice when cherry-pick is in progress | Ralf Thielow | 2013-06-17 | 1 | -2/+4 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname' | Junio C Hamano | 2013-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | tests: allow sha1's as part of the path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query' | Junio C Hamano | 2013-06-24 | 2 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | rebase: use peel_committish() where appropriate | Ramkumar Ramachandra | 2013-06-14 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | t/rebase: add failing tests for a peculiar revision | Ramkumar Ramachandra | 2013-06-14 | 2 | -0/+22 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/rm-coalesce-errors' | Junio C Hamano | 2013-06-24 | 1 | -0/+96 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | rm: introduce advice.rmHints to shorten messages | Mathieu Lienard--Mayor | 2013-06-12 | 1 | -0/+29 |
| * | | | | | | | | | | | | | | | | | | | rm: better error message on failure for multiple files | Mathieu Lienard--Mayor | 2013-06-12 | 1 | -0/+67 |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |