?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'fk/doc-format-patch-vn'
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-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
Michael J Gruber's git tree