aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'dt/reflog-tests'Junio C Hamano2015-08-12
|\
| * tests: remove some direct access to .git/logsDavid Turner2015-07-28
| * t/t7509: remove unnecessary manipulation of reflogDavid Turner2015-07-28
* | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-12
|\ \
| * | Documentation/git-worktree: fix duplicated 'from'Patrick Steinhardt2015-08-05
| * | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-28
| * | Documentation/git-worktree: fix broken 'linkgit' invocationEric Sunshine2015-07-24
| * | checkout: drop intimate knowledge of newly created worktreeEric Sunshine2015-07-20
| * | worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine2015-07-20
| * | worktree: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-20
| * | worktree: make setup of new HEAD distinct from worktree populationEric Sunshine2015-07-20
| * | worktree: detect branch-name/detached and error conditions locallyEric Sunshine2015-07-20
| * | worktree: add_worktree: construct worktree-population command locallyEric Sunshine2015-07-20
| * | worktree: elucidate environment variables intended for child processesEric Sunshine2015-07-20
| * | worktree: make branch creation distinct from worktree populationEric Sunshine2015-07-20
| * | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-20
| * | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-20
| * | worktree: introduce options containerEric Sunshine2015-07-20
| * | worktree: simplify new branch (-b/-B) option checkingEric Sunshine2015-07-20
| * | worktree: improve worktree setup messageEric Sunshine2015-07-20
| * | branch: publish die_if_checked_out()Eric Sunshine2015-07-20
| * | checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine2015-07-20
| * | checkout: check_linked_checkout: simplify symref parsingEric Sunshine2015-07-20
| * | checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine2015-07-20
| * | checkout: generalize die_if_checked_out() branch name argumentEric Sunshine2015-07-20
| * | checkout: die_if_checked_out: simplify strbuf managementEric Sunshine2015-07-20
| * | checkout: improve die_if_checked_out() robustnessEric Sunshine2015-07-20
| * | checkout: name check_linked_checkouts() more meaningfullyEric Sunshine2015-07-20
| * | checkout: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-20
* | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-12
|\ \ \
| * | | git-am: add am.threeWay config variableRemi Lespinet2015-08-04
| * | | builtin-am: remove redirection to git-am.shPaul Tan2015-08-04
| * | | builtin-am: check for valid committer identPaul Tan2015-08-04
| * | | builtin-am: implement legacy -b/--binary optionPaul Tan2015-08-04
| * | | builtin-am: implement -i/--interactivePaul Tan2015-08-04
| * | | builtin-am: support and auto-detect mercurial patchesPaul Tan2015-08-04
| * | | builtin-am: support and auto-detect StGit series filesPaul Tan2015-08-04
| * | | builtin-am: support and auto-detect StGit patchesPaul Tan2015-08-04
| * | | builtin-am: rerere supportPaul Tan2015-08-04
| * | | builtin-am: invoke post-applypatch hookPaul Tan2015-08-04
| * | | builtin-am: invoke pre-applypatch hookPaul Tan2015-08-04
| * | | builtin-am: invoke applypatch-msg hookPaul Tan2015-08-04
| * | | builtin-am: support automatic notes copyingPaul Tan2015-08-04
| * | | builtin-am: invoke post-rewrite hookPaul Tan2015-08-04
| * | | builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan2015-08-04
| * | | builtin-am: implement --committer-date-is-author-datePaul Tan2015-08-04
| * | | builtin-am: implement --ignore-datePaul Tan2015-08-04
| * | | builtin-am: pass git-apply's options to git-applyPaul Tan2015-08-04
| * | | builtin-am: implement --[no-]scissorsPaul Tan2015-08-04
| * | | builtin-am: support --keep-cr, am.keepcrPaul Tan2015-08-04