?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
builtin-am: implement --skip
2015-08-05 Paul Tanbuiltin-am: implement --skip
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: don't parse mail when resuming
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: implement --resolved/--continue
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: refuse to apply patches if index is dirty
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: implement committing applied patch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: apply patch with git-apply
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: extract patch and commit info with git...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: auto-detect mbox patches
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: split out mbox/maildir patches with git...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: implement patch queue mechanism
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanbuiltin-am: implement skeletal builtin am
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanwrapper: implement xfopen()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-08-05 Paul Tanwrapper: implement xopen()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant3901: test git-am encoding conversion
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant3418: non-interactive rebase --continue with rerere...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: tests for am --[no-]scissors
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am with post-applypatch hook
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am with pre-applypatch hook
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am with applypatch-msg hook
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am --resolved fails if index has unmerged entries
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am --resolved fails if index has no changes
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am refuses patches when paused
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4151: am --abort will keep dirty index intact
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-20 Paul Tant4150: am fails if index is dirty
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-07-07 Paul Tant4150: am.messageid really adds the message id
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: remove redirection to git-pull.sh
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull --rebase: error on no merge candidate cases
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull --rebase: exit early when the working directory...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: configure --rebase via branch.<name>.rebase or...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: teach git pull about --rebase
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: set reflog message
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: implement pulling into an unborn branch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: fast-forward working tree if head is updated
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: check if in unresolved merge state
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: support pull.ff config
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: error on no merge candidates
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-18 Paul Tanpull: pass git-fetch's options to git-fetch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanpull: pass git-merge's options to git-merge
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanpull: pass verbosity, --progress flags to fetch and...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanpull: implement fetch + merge
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanpull: implement skeletal builtin pull
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanargv-array: implement argv_array_pushv()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanparse-options-cb: implement parse_opt_passthru_argv()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanparse-options-cb: implement parse_opt_passthru()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanam: teach mercurial patch parser how to read from stdin
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanam: use gmtime() to parse mercurial patch date
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tant4150: test applying StGit series
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-15 Paul Tanam: teach StGit patch parser how to read from stdin
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-12 Paul Tant0302: "unreadable" test needs SANITY prereq
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam --abort: keep unrelated commits on unborn branch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam --abort: support aborting to unborn branch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam --abort: revert changes introduced by failed 3way...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam --skip: support skipping while on unborn branch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam -3: support 3way merge on unborn branch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tanam --skip: revert changes introduced by failed 3way...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-08 Paul Tant4150: test applying StGit patch
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-02 Paul Tanpull: use git-rev-parse --parseopt for option parsing
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-06-02 Paul Tanpull: handle git-fetch's options as well
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: check reflog action in fast-forward merge
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5521: test --dry-run does not make any changes
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test --rebase failure on unborn branch with...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test --rebase with multiple branches
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test work tree fast-forward when fetch updates...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-29 Paul Tant5520: test for failure if index has unresolved entries
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-18 Paul Tanpull: parse pull.ff as a bool or string
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-18 Paul Tanpull: make pull.ff=true override merge.ff
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-18 Paul Tanpull: handle --log=<n>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-18 Paul Tant5520: test no merge candidates cases
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-18 Paul Tant5520: prevent field splitting in content comparisons
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-14 Paul Tanpull: remove --tags error in no merge candidates case
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tanpath.c: remove home_config_paths()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tangit-config: replace use of home_config_paths()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tangit-commit: replace use of home_config_paths()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tancredential-store.c: replace home_config_paths() with...
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tandir.c: replace home_config_paths() with xdg_config_home()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tanattr.c: replace home_config_paths() with xdg_config_home()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-05-06 Paul Tanpath.c: implement xdg_config_home()
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-03-31 Paul Tanenter_repo(): fix docs to match code
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-03-24 Paul Tant0302: test credential-store support for XDG_CONFIG_HOME
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-03-24 Paul Tangit-credential-store: support XDG_CONFIG_HOME
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
2015-03-24 Paul Tangit-credential-store: support multiple credential files
Signed-off-by: Paul Tan <pyokagan@gmail.com>
 commit | commitdiff | tree
Extra changes on top of the MinGW port of git