| 2015-08-05 | builtin-am: remove redirection to git-am.sh Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: check for valid committer ident Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement legacy -b/--binary option Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -i/--interactive Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: support and auto-detect mercurial patches Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: support and auto-detect StGit series files Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: support and auto-detect StGit patches Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: rerere support Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: invoke post-applypatch hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: invoke pre-applypatch hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: invoke applypatch-msg hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: support automatic notes copying Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: invoke post-rewrite hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -S/--gpg-sign, commit.gpgsign Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --committer-date-is-author-date Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --ignore-date Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: pass git-apply's options to git-apply Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --[no-]scissors Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: support --keep-cr, am.keepcr Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --[no-]message-id, am.messageid Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -k/--keep, --keep-non-patch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -u/--utf8 Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: handle stray state directory Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: bypass git-mailinfo when --rebasing Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --rebasing mode Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --3way Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | cache-tree: introduce write_index_as_tree() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -s/--signoff Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: exit with user friendly message on failure Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement -q/--quiet Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: reject patches when there's a session in... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --abort Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --skip Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: don't parse mail when resuming Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement --resolved/--continue Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: refuse to apply patches if index is dirty Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement committing applied patch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: apply patch with git-apply Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: extract patch and commit info with git... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: auto-detect mbox patches Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: split out mbox/maildir patches with git... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement patch queue mechanism Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | builtin-am: implement skeletal builtin am Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | wrapper: implement xfopen() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-08-05 | wrapper: implement xopen() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t3901: test git-am encoding conversion Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t3418: non-interactive rebase --continue with rerere... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: tests for am --[no-]scissors Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am with post-applypatch hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am with pre-applypatch hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am with applypatch-msg hook Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am --resolved fails if index has unmerged entries Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am --resolved fails if index has no changes Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am refuses patches when paused Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4151: am --abort will keep dirty index intact Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-20 | t4150: am fails if index is dirty Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-07-07 | t4150: am.messageid really adds the message id Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: remove redirection to git-pull.sh Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull --rebase: error on no merge candidate cases Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull --rebase: exit early when the working directory... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: configure --rebase via branch.<name>.rebase or... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: teach git pull about --rebase Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: set reflog message Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: implement pulling into an unborn branch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: fast-forward working tree if head is updated Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: check if in unresolved merge state Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: support pull.ff config Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: error on no merge candidates Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-18 | pull: pass git-fetch's options to git-fetch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | pull: pass git-merge's options to git-merge Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | pull: pass verbosity, --progress flags to fetch and... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | pull: implement fetch + merge Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | pull: implement skeletal builtin pull Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | argv-array: implement argv_array_pushv() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | parse-options-cb: implement parse_opt_passthru_argv() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | parse-options-cb: implement parse_opt_passthru() Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | am: teach mercurial patch parser how to read from stdin Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | am: use gmtime() to parse mercurial patch date Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | t4150: test applying StGit series Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-15 | am: teach StGit patch parser how to read from stdin Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-12 | t0302: "unreadable" test needs SANITY prereq Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am --abort: keep unrelated commits on unborn branch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am --abort: support aborting to unborn branch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am --abort: revert changes introduced by failed 3way... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am --skip: support skipping while on unborn branch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am -3: support 3way merge on unborn branch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | am --skip: revert changes introduced by failed 3way... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-08 | t4150: test applying StGit patch Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-02 | pull: use git-rev-parse --parseopt for option parsing Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-06-02 | pull: handle git-fetch's options as well Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5520: check reflog action in fast-forward merge Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5521: test --dry-run does not make any changes Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5520: test --rebase failure on unborn branch with... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5520: test --rebase with multiple branches Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5520: test work tree fast-forward when fetch updates... Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-29 | t5520: test for failure if index has unresolved entries Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-18 | pull: parse pull.ff as a bool or string Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-18 | pull: make pull.ff=true override merge.ff Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-18 | pull: handle --log=<n> Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |
| 2015-05-18 | t5520: test no merge candidates cases Signed-off-by: Paul Tan <pyokagan@gmail.com> |
diff | tree |