summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-updateFabio Porcedda2015-11-061-2/+0
* Merge branch 'as/subtree-with-spaces'Junio C Hamano2015-10-052-74/+124
|\
| * contrib/subtree: respect spaces in a repository pathas/subtree-with-spacesAlexey Shumkin2015-09-082-1/+48
| * t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-082-73/+76
* | Merge branch 'jk/connect-clear-env'Junio C Hamano2015-10-052-11/+49
|\ \
| * | git_connect: clarify conn->use_shell flagjk/connect-clear-envJeff King2015-09-081-9/+13
| * | git_connect: clear GIT_* environment for sshJeff King2015-09-042-2/+36
* | | Merge branch 'jk/date-local'Junio C Hamano2015-10-0510-114/+166
|\ \ \
| * | | t6300: add tests for "-local" date formatsjk/date-localJohn Keeping2015-09-031-0/+36
| * | | t6300: make UTC and local dates differentJohn Keeping2015-09-031-35/+35
| * | | date: make "local" orthogonal to date formatJeff King2015-09-034-33/+61
| * | | date: check for "local" before anything elseJohn Keeping2015-09-031-3/+3
| * | | t6300: add test for "raw" date formatJohn Keeping2015-09-031-0/+4
| * | | t6300: introduce test_date() helperJohn Keeping2015-09-031-52/+40
| * | | fast-import: switch crash-report date to iso8601Jeff King2015-09-031-1/+1
| * | | Documentation/rev-list: don't list date formatsJohn Keeping2015-09-032-2/+2
| * | | Documentation/git-for-each-ref: don't list date formatsJohn Keeping2015-09-031-3/+2
| * | | Documentation/config: don't list date formatsJohn Keeping2015-09-031-3/+1
| * | | Documentation/blame-options: don't list date formatsJohn Keeping2015-09-031-3/+2
* | | | Merge branch 'dt/refs-bisection'Junio C Hamano2015-10-056-33/+313
|\ \ \ \
| * | | | refs: make refs/bisect/* per-worktreedt/refs-bisectionDavid Turner2015-09-016-3/+67
| * | | | path: optimize common dir checkingDavid Turner2015-09-012-14/+214
| * | | | refs: clean up common_listDavid Turner2015-09-011-21/+37
* | | | | Merge branch 'nk/stash-show-config'Junio C Hamano2015-10-053-1/+31
|\ \ \ \ \
| * | | | | stash: allow "stash show" diff output configurablenk/stash-show-configNamhyung Kim2015-08-313-1/+31
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/async-pkt-line'Junio C Hamano2015-10-053-2/+23
|\ \ \ \ \
| * | | | | pkt-line: show packets in async processes as "sideband"jk/async-pkt-lineJeff King2015-09-011-1/+7
| * | | | | run-command: provide in_async query functionJeff King2015-09-012-1/+16
* | | | | | Merge branch 'jh/quiltimport-explicit-series-file'Junio C Hamano2015-10-052-4/+23
|\ \ \ \ \ \
| * | | | | | git-quiltimport: add commandline option --series <file>jh/quiltimport-explicit-series-fileJuerg Haefliger2015-09-012-4/+23
* | | | | | | Merge branch 'ld/p4-import-labels'Junio C Hamano2015-10-052-8/+62
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labelsLuke Diamand2015-08-282-9/+18
| * | | | | | | git-p4: do not terminate creating tag for unknown commitLuke Diamand2015-08-281-2/+2
| * | | | | | | git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-281-0/+45
* | | | | | | | Merge branch 'ad/bisect-terms'Junio C Hamano2015-10-054-16/+350
|\ \ \ \ \ \ \ \
| * | | | | | | | bisect: allow setting any user-specified in 'git bisect start'Matthieu Moy2015-08-033-3/+132
| * | | | | | | | bisect: add 'git bisect terms' to view the current termsMatthieu Moy2015-08-033-1/+68
| * | | | | | | | bisect: add the terms old/newAntoine Delaite2015-08-034-14/+119
| * | | | | | | | bisect: sanity check on termsMatthieu Moy2015-08-031-0/+33
* | | | | | | | | Merge branch 'jc/rerere'Junio C Hamano2015-10-053-154/+417
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere: un-nest merge() furtherjc/rerereJunio C Hamano2015-07-241-24/+26
| * | | | | | | | | rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-243-28/+85
| * | | | | | | | | rerere: call conflict-ids IDsJunio C Hamano2015-07-243-41/+41
| * | | | | | | | | rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-241-9/+6
| * | | | | | | | | rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-241-32/+33
| * | | | | | | | | rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-241-35/+40
| * | | | | | | | | rerere: explain the remainderJunio C Hamano2015-07-241-0/+20
| * | | | | | | | | rerere: explain "rerere forget" codepathJunio C Hamano2015-07-241-0/+24
| * | | | | | | | | rerere: explain the primary codepathJunio C Hamano2015-07-241-13/+82
| * | | | | | | | | rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-241-0/+41