summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-03-08Documentation: improve description of "git reset --keep"Libravatar Junio C Hamano1-3/+6
2010-03-06reset: disallow using --keep when there are unmerged entriesLibravatar Christian Couder4-22/+28
2010-03-06reset: disallow "reset --keep" outside a work treeLibravatar Christian Couder2-9/+18
2010-03-06Documentation: reset: describe new "--keep" optionLibravatar Christian Couder1-1/+48
2010-01-24reset: add test cases for "--keep" optionLibravatar Christian Couder2-1/+126
2010-01-24reset: add option "--keep" to "git reset"Libravatar Christian Couder1-5/+24
2010-01-24Merge branch 'jc/fix-tree-walk'Libravatar Junio C Hamano19-140/+734
2010-01-24Make test numbers uniqueLibravatar Johannes Sixt1-0/+0
2010-01-24Merge branch 'maint'Libravatar Junio C Hamano5-23/+48
2010-01-24Merge branch 'maint' of git://git.spearce.org/git-gui into maintLibravatar Junio C Hamano5-23/+48
2010-01-24Windows: Remove dependency on pthreadGC2.dllLibravatar Michael Lukashov1-1/+3
2010-01-24Documentation: move away misplaced 'push --upstream' descriptionLibravatar Thomas Rast1-7/+7
2010-01-24Documentation: add missing :: in config.txtLibravatar Thomas Rast1-1/+1
2010-01-24Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastLibravatar Junio C Hamano3-80/+102
2010-01-24pull: re-fix command line generationLibravatar Junio C Hamano2-1/+36
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchLibravatar Jonathan Nieder1-6/+8
2010-01-24Documentation: simplify How Merge WorksLibravatar Jonathan Nieder1-36/+16
2010-01-24Documentation: merge: add a section about fast-forwardLibravatar Jonathan Nieder1-13/+18
2010-01-24Documentation: emphasize when git merge terminates earlyLibravatar Jonathan Nieder1-10/+21
2010-01-24Documentation: merge: add an overviewLibravatar Jonathan Nieder1-2/+26
2010-01-24Documentation: merge: move merge strategy list to endLibravatar Jonathan Nieder1-2/+2
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionLibravatar Jonathan Nieder1-3/+3
2010-01-24Documentation: merge: move configuration section to endLibravatar Jonathan Nieder1-9/+9
2010-01-23rebase -i: Export GIT_AUTHOR_* variables explicitlyLibravatar Junio C Hamano1-4/+4
2010-01-23git-gui: work from the .git dirLibravatar Giuseppe Bilotta1-0/+10
2010-01-23git-gui: Fix applying a line when all following lines are deletionsLibravatar Jeff Epler1-0/+1
2010-01-23git-gui: Correct file_states when unstaging partly staged entryLibravatar Jens Lehmann1-0/+3
2010-01-23git-gui: Fix gitk for branch whose name matches local fileLibravatar Peter Krefting1-1/+1
2010-01-23git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncLibravatar Christopher Beelby1-0/+4
2010-01-23git-gui: handle really long error messages in updateindex.Libravatar Pat Thoyts1-16/+18
2010-01-23Documentation: rev-list: fix synopsys for --tags and and --remotesLibravatar Christian Couder1-2/+2
2010-01-23Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano9-162/+1018
2010-01-23git-svn: allow subset of branches/tags to be specified in glob specLibravatar Jay Soffian4-20/+320
2010-01-23git-svn: allow UUID to be manually remapped via rewriteUUIDLibravatar Jay Soffian4-8/+140
2010-01-23git-svn: update svn mergeinfo test suiteLibravatar Andrew Myrick3-127/+485
2010-01-23git-svn: document --username/commit-url for branch/tagLibravatar Igor Mironov1-0/+13
2010-01-23git-svn: add --username/commit-url options for branch/tagLibravatar Igor Mironov1-2/+6
2010-01-23git-svn: respect commiturl option for branch/tagLibravatar Igor Mironov1-1/+11
2010-01-23git-svn: fix mismatched src/dst errors for branch/tagLibravatar Igor Mironov1-0/+4
2010-01-23git-svn: handle merge-base failuresLibravatar Andrew Myrick1-4/+15
2010-01-23git-svn: ignore changeless commits when checking for a cherry-pickLibravatar Andrew Myrick1-0/+24
2010-01-22t7800-difftool.sh: Test mergetool.prompt fallbackLibravatar David Aguilar1-0/+12
2010-01-22msvc: Add a definition of NORETURN compatible with msvc compilerLibravatar Ramsay Jones1-0/+3
2010-01-22Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+26
2010-01-22msvc: Fix a compiler warning due to an incorrect pointer castLibravatar Ramsay Jones1-1/+1
2010-01-22msvc: Fix an "unrecognized option" linker warningLibravatar Ramsay Jones2-0/+2
2010-01-22Merge branch 'maint'Libravatar Junio C Hamano2-9/+36
2010-01-22Merge branch 'jc/branch-d'Libravatar Junio C Hamano2-10/+80
2010-01-22Merge branch 'il/rev-glob'Libravatar Junio C Hamano9-19/+357
2010-01-22Merge branch 'js/refer-upstream'Libravatar Junio C Hamano3-13/+192
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:36:00 +0000