mergetool--lib: refactor {diff,merge}_cmd logic

John Keeping committed over 13 years ago

Documentation/Makefile: move infodir to be with other '*dir's

John Keeping committed over 13 years ago

Documentation/Makefile: fix spaces around assignments

John Keeping committed over 13 years ago

GIT-VERSION-GEN: support non-standard $GIT_DIR path

Dennis Kaarsemaker committed over 13 years ago

tests: allow sha1's as part of the path

Dennis Kaarsemaker committed over 13 years ago

rebase: use 'git stash store' to simplify logic

Ramkumar Ramachandra committed over 13 years ago

stash: introduce 'git stash store'

Ramkumar Ramachandra committed over 13 years ago

checkout: respect GIT_REFLOG_ACTION

Ramkumar Ramachandra committed over 13 years ago

status: do not depend on rebase reflog messages

Ramkumar Ramachandra committed over 13 years ago

t/t2021-checkout-last: "checkout -" should work after a rebase finishes

Ramkumar Ramachandra committed over 13 years ago

wt-status: remove unused field in grab_1st_switch_cbdata

Ramkumar Ramachandra committed over 13 years ago

t7512: test "detached from" as well

Junio C Hamano committed over 13 years ago

unpack-trees: don't shift conflicts left and right

René Scharfe committed over 13 years ago

stash: simplify option parser for create

Ramkumar Ramachandra committed over 13 years ago

stash doc: document short form -p in synopsis

Ramkumar Ramachandra committed over 13 years ago

stash doc: add a warning about using create

Ramkumar Ramachandra committed over 13 years ago

t/am: use test_path_is_missing() where appropriate

Ramkumar Ramachandra committed over 13 years ago

am: handle stray $dotest directory

Ramkumar Ramachandra committed over 13 years ago

Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui

Junio C Hamano committed over 13 years ago

status: introduce status.branch to enable --branch by default

Jorge Juan Garcia Garcia committed over 13 years ago