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

git-gui: Fix applying a line when all following lines are deletions

Jeff Epler committed almost 17 years ago

git-gui: Correct file_states when unstaging partly staged entry

Jens Lehmann committed almost 17 years ago

git-gui: Fix gitk for branch whose name matches local file

Peter Krefting committed almost 17 years ago

git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync

Christopher Beelby committed almost 17 years ago

git-gui: handle really long error messages in updateindex.

Pat Thoyts committed almost 17 years ago

Documentation: rev-list: fix synopsys for --tags and and --remotes

Christian Couder committed almost 17 years ago