Junio C Hamano committed almost 17 years ago
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
Junio C Hamano committed almost 17 years ago
Windows: Remove dependency on pthreadGC2.dll
Michael Lukashov committed almost 17 years ago
Documentation: move away misplaced 'push --upstream' description
Thomas Rast committed almost 17 years ago
Documentation: add missing :: in config.txt
Thomas Rast committed almost 17 years ago
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