| 2019-05-13 | difftool: fallback on merge.guitool Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-13 | difftool: make --gui, --tool and --extcmd mutually... Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-13 | mergetool: fallback to tool when guitool unavailable Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-13 | mergetool--lib: create gui_mode function Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-13 | mergetool: use get_merge_tool function Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-09 | tag: fix typo in nested tagging hint Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-07 | revisions.txt: mention <rev>~ form Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-07 | revisions.txt: mark optional rev arguments with [] Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-07 | revisions.txt: change "rev" to "<rev>" Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-07 | branch: make create_branch accept a merge base rev Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-07 | t2018: cleanup in current test Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-05 | *.[ch]: manually align parameter lists Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-05 | *.[ch]: remove extern from function declarations using sed Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-05-05 | *.[ch]: remove extern from function declarations using... Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-25 | t7610: add mergetool --gui tests Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-25 | t7610: unsuppress output Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-19 | cherry-pick/revert: add scissors line on merge conflict Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | merge: add scissors line on merge conflict Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | merge: cleanup messages like commit Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | parse-options.h: extract common --cleanup option Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | commit: extract cleanup_mode functions to sequencer Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | t7502: clean up style Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | t7604: clean up style Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | t3507: clean up style Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-18 | t7600: clean up style Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-12 | tag: advise on nested tags Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-10 | submodule: teach set-branch subcommand Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-05 | tag: fix formatting Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-04 | cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-04-04 | midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-03-12 | contrib/subtree: ensure only one rev is provided Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-03-08 | docs: move core.excludesFile from git-add to gitignore Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-03-08 | git-clean.txt: clarify ignore pattern files Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-03-05 | git-reset.txt: clarify documentation Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-02-15 | submodule: document default behavior Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-02-08 | submodule--helper: teach config subcommand --unset Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-02-07 | git-submodule.txt: "--branch <branch>" option defaults... Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2019-02-06 | completion: complete git submodule absorbgitdirs Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2018-10-25 | doc: document diff/merge.guitool config keys Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2018-10-25 | completion: support `git mergetool --[no-]gui` Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2018-10-25 | mergetool: accept -g/--[no-]gui as arguments Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |
| 2017-02-08 | Document the --no-gui option in difftool Signed-off-by: Denton Liu <liu.denton@gmail.com> |
diff | tree |