Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast

Junio C Hamano committed almost 17 years ago

pull: re-fix command line generation

Junio C Hamano committed almost 17 years ago

Documentation: merge: use MERGE_HEAD to refer to the remote branch

Jonathan Nieder committed almost 17 years ago

Documentation: simplify How Merge Works

Jonathan Nieder committed almost 17 years ago

Documentation: merge: add a section about fast-forward

Jonathan Nieder committed almost 17 years ago

Documentation: emphasize when git merge terminates early

Jonathan Nieder committed almost 17 years ago

Documentation: merge: add an overview

Jonathan Nieder committed almost 17 years ago

Documentation: merge: move merge strategy list to end

Jonathan Nieder committed almost 17 years ago

Documentation: suggest `reset --merge` in How Merge Works section

Jonathan Nieder committed almost 17 years ago

Documentation: merge: move configuration section to end

Jonathan Nieder committed almost 17 years ago

Make ce_uptodate() trustworthy again

Junio C Hamano committed almost 17 years ago

rebase -i: Export GIT_AUTHOR_* variables explicitly

Junio C Hamano committed almost 17 years ago

git-gui: set GIT_DIR and GIT_WORK_TREE after setup

Giuseppe Bilotta committed almost 17 years ago

git-gui: update shortcut tools to use _gitworktree

Giuseppe Bilotta committed almost 17 years ago

git-gui: handle bare repos correctly

Giuseppe Bilotta committed almost 17 years ago

git-gui: handle non-standard worktree locations

Giuseppe Bilotta committed almost 17 years ago

git-gui: Support applying a range of changes at once

Jeff Epler committed almost 17 years ago

git-gui: Add a special diff popup menu for submodules

Jens Lehmann committed almost 17 years ago

git-gui: Use git diff --submodule when available

Jens Lehmann committed almost 17 years ago

git-gui: work from the .git dir

Giuseppe Bilotta committed almost 17 years ago