Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-update | Fabio Porcedda | 2015-11-06 | 1 | -2/+0 |
* | Merge branch 'as/subtree-with-spaces' | Junio C Hamano | 2015-10-05 | 2 | -74/+124 |
|\ | |||||
| * | contrib/subtree: respect spaces in a repository pathas/subtree-with-spaces | Alexey Shumkin | 2015-09-08 | 2 | -1/+48 |
| * | t7900-subtree: test the "space in a subdirectory name" case | Alexey Shumkin | 2015-09-08 | 2 | -73/+76 |
* | | Merge branch 'jk/connect-clear-env' | Junio C Hamano | 2015-10-05 | 2 | -11/+49 |
|\ \ | |||||
| * | | git_connect: clarify conn->use_shell flagjk/connect-clear-env | Jeff King | 2015-09-08 | 1 | -9/+13 |
| * | | git_connect: clear GIT_* environment for ssh | Jeff King | 2015-09-04 | 2 | -2/+36 |
* | | | Merge branch 'jk/date-local' | Junio C Hamano | 2015-10-05 | 10 | -114/+166 |
|\ \ \ | |||||
| * | | | t6300: add tests for "-local" date formatsjk/date-local | John Keeping | 2015-09-03 | 1 | -0/+36 |
| * | | | t6300: make UTC and local dates different | John Keeping | 2015-09-03 | 1 | -35/+35 |
| * | | | date: make "local" orthogonal to date format | Jeff King | 2015-09-03 | 4 | -33/+61 |
| * | | | date: check for "local" before anything else | John Keeping | 2015-09-03 | 1 | -3/+3 |
| * | | | t6300: add test for "raw" date format | John Keeping | 2015-09-03 | 1 | -0/+4 |
| * | | | t6300: introduce test_date() helper | John Keeping | 2015-09-03 | 1 | -52/+40 |
| * | | | fast-import: switch crash-report date to iso8601 | Jeff King | 2015-09-03 | 1 | -1/+1 |
| * | | | Documentation/rev-list: don't list date formats | John Keeping | 2015-09-03 | 2 | -2/+2 |
| * | | | Documentation/git-for-each-ref: don't list date formats | John Keeping | 2015-09-03 | 1 | -3/+2 |
| * | | | Documentation/config: don't list date formats | John Keeping | 2015-09-03 | 1 | -3/+1 |
| * | | | Documentation/blame-options: don't list date formats | John Keeping | 2015-09-03 | 1 | -3/+2 |
* | | | | Merge branch 'dt/refs-bisection' | Junio C Hamano | 2015-10-05 | 6 | -33/+313 |
|\ \ \ \ | |||||
| * | | | | refs: make refs/bisect/* per-worktreedt/refs-bisection | David Turner | 2015-09-01 | 6 | -3/+67 |
| * | | | | path: optimize common dir checking | David Turner | 2015-09-01 | 2 | -14/+214 |
| * | | | | refs: clean up common_list | David Turner | 2015-09-01 | 1 | -21/+37 |
* | | | | | Merge branch 'nk/stash-show-config' | Junio C Hamano | 2015-10-05 | 3 | -1/+31 |
|\ \ \ \ \ | |||||
| * | | | | | stash: allow "stash show" diff output configurablenk/stash-show-config | Namhyung Kim | 2015-08-31 | 3 | -1/+31 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/async-pkt-line' | Junio C Hamano | 2015-10-05 | 3 | -2/+23 |
|\ \ \ \ \ | |||||
| * | | | | | pkt-line: show packets in async processes as "sideband"jk/async-pkt-line | Jeff King | 2015-09-01 | 1 | -1/+7 |
| * | | | | | run-command: provide in_async query function | Jeff King | 2015-09-01 | 2 | -1/+16 |
* | | | | | | Merge branch 'jh/quiltimport-explicit-series-file' | Junio C Hamano | 2015-10-05 | 2 | -4/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-quiltimport: add commandline option --series <file>jh/quiltimport-explicit-series-file | Juerg Haefliger | 2015-09-01 | 2 | -4/+23 |
* | | | | | | | Merge branch 'ld/p4-import-labels' | Junio C Hamano | 2015-10-05 | 2 | -8/+62 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labels | Luke Diamand | 2015-08-28 | 2 | -9/+18 |
| * | | | | | | | git-p4: do not terminate creating tag for unknown commit | Luke Diamand | 2015-08-28 | 1 | -2/+2 |
| * | | | | | | | git-p4: failing test for ignoring invalid p4 labels | Luke Diamand | 2015-08-28 | 1 | -0/+45 |
* | | | | | | | | Merge branch 'ad/bisect-terms' | Junio C Hamano | 2015-10-05 | 4 | -16/+350 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bisect: allow setting any user-specified in 'git bisect start' | Matthieu Moy | 2015-08-03 | 3 | -3/+132 |
| * | | | | | | | | bisect: add 'git bisect terms' to view the current terms | Matthieu Moy | 2015-08-03 | 3 | -1/+68 |
| * | | | | | | | | bisect: add the terms old/new | Antoine Delaite | 2015-08-03 | 4 | -14/+119 |
| * | | | | | | | | bisect: sanity check on terms | Matthieu Moy | 2015-08-03 | 1 | -0/+33 |
* | | | | | | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2015-10-05 | 3 | -154/+417 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rerere: un-nest merge() furtherjc/rerere | Junio C Hamano | 2015-07-24 | 1 | -24/+26 |
| * | | | | | | | | | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 2015-07-24 | 3 | -28/+85 |
| * | | | | | | | | | rerere: call conflict-ids IDs | Junio C Hamano | 2015-07-24 | 3 | -41/+41 |
| * | | | | | | | | | rerere: further clarify do_rerere_one_path() | Junio C Hamano | 2015-07-24 | 1 | -9/+6 |
| * | | | | | | | | | rerere: further de-dent do_plain_rerere() | Junio C Hamano | 2015-07-24 | 1 | -32/+33 |
| * | | | | | | | | | rerere: refactor "replay" part of do_plain_rerere() | Junio C Hamano | 2015-07-24 | 1 | -35/+40 |
| * | | | | | | | | | rerere: explain the remainder | Junio C Hamano | 2015-07-24 | 1 | -0/+20 |
| * | | | | | | | | | rerere: explain "rerere forget" codepath | Junio C Hamano | 2015-07-24 | 1 | -0/+24 |
| * | | | | | | | | | rerere: explain the primary codepath | Junio C Hamano | 2015-07-24 | 1 | -13/+82 |
| * | | | | | | | | | rerere: explain MERGE_RR management helpers | Junio C Hamano | 2015-07-24 | 1 | -0/+41 |