summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: detect branch-name/detached and error conditions locallyEric Sunshine2015-07-201-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add_worktree: construct worktree-population command locallyEric Sunshine2015-07-201-11/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: elucidate environment variables intended for child processesEric Sunshine2015-07-201-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: make branch creation distinct from worktree populationEric Sunshine2015-07-201-3/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-203-4/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-202-2/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: introduce options containerEric Sunshine2015-07-201-18/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: simplify new branch (-b/-B) option checkingEric Sunshine2015-07-201-5/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: improve worktree setup messageEric Sunshine2015-07-201-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | branch: publish die_if_checked_out()Eric Sunshine2015-07-203-67/+74
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine2015-07-202-1/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: check_linked_checkout: simplify symref parsingEric Sunshine2015-07-201-9/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine2015-07-201-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: generalize die_if_checked_out() branch name argumentEric Sunshine2015-07-201-7/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: die_if_checked_out: simplify strbuf managementEric Sunshine2015-07-201-4/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: improve die_if_checked_out() robustnessEric Sunshine2015-07-201-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: name check_linked_checkouts() more meaningfullyEric Sunshine2015-07-201-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-201-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-1212-15/+2432
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-08-044-2/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: remove redirection to git-am.shPaul Tan2015-08-044-22/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: check for valid committer identPaul Tan2015-08-041-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement legacy -b/--binary optionPaul Tan2015-08-041-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -i/--interactivePaul Tan2015-08-041-1/+104
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: support and auto-detect mercurial patchesPaul Tan2015-08-041-1/+73
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: support and auto-detect StGit series filesPaul Tan2015-08-041-1/+58
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: support and auto-detect StGit patchesPaul Tan2015-08-041-1/+131
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: rerere supportPaul Tan2015-08-041-0/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: invoke post-applypatch hookPaul Tan2015-08-041-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: invoke pre-applypatch hookPaul Tan2015-08-041-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: invoke applypatch-msg hookPaul Tan2015-08-041-0/+24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: support automatic notes copyingPaul Tan2015-08-041-0/+60
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: invoke post-rewrite hookPaul Tan2015-08-041-0/+55
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan2015-08-041-1/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --committer-date-is-author-datePaul Tan2015-08-041-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --ignore-datePaul Tan2015-08-041-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: pass git-apply's options to git-applyPaul Tan2015-08-041-0/+45
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --[no-]scissorsPaul Tan2015-08-041-0/+48
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: support --keep-cr, am.keepcrPaul Tan2015-08-041-6/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --[no-]message-id, am.messageidPaul Tan2015-08-041-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -k/--keep, --keep-non-patchPaul Tan2015-08-041-0/+50
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -u/--utf8Paul Tan2015-08-041-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: handle stray state directoryPaul Tan2015-08-041-0/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: bypass git-mailinfo when --rebasingPaul Tan2015-08-041-1/+133
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --rebasing modePaul Tan2015-08-041-4/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement --3wayPaul Tan2015-08-041-4/+150
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | cache-tree: introduce write_index_as_tree()Paul Tan2015-08-042-12/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -s/--signoffPaul Tan2015-08-041-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: exit with user friendly message on failurePaul Tan2015-08-041-4/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-am: implement -q/--quietPaul Tan2015-08-041-3/+28