summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* reset: add test cases for "--keep" optionChristian Couder2010-01-252-1/+126
* reset: add option "--keep" to "git reset"Christian Couder2010-01-251-5/+24
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-2519-140/+734
|\
| * read-tree --debug-unpackJunio C Hamano2010-01-083-0/+72
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-085-7/+140
| * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-074-65/+173
| * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-042-6/+9
| * traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-043-46/+237
| * more D/F conflict testsJunio C Hamano2010-01-041-0/+102
| * tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-049-18/+6
* | Make test numbers uniqueJohannes Sixt2010-01-241-0/+0
* | Merge branch 'maint'Junio C Hamano2010-01-245-23/+48
|\ \
| * \ Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-245-23/+48
| |\ \
| | * | git-gui: work from the .git dirGiuseppe Bilotta2010-01-241-0/+10
| | * | git-gui: Fix applying a line when all following lines are deletionsJeff Epler2010-01-241-0/+1
| | * | git-gui: Correct file_states when unstaging partly staged entryJens Lehmann2010-01-231-0/+3
| | * | git-gui: Fix gitk for branch whose name matches local filePeter Krefting2010-01-231-1/+1
| | * | git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby2010-01-231-0/+4
| | * | git-gui: handle really long error messages in updateindex.Pat Thoyts2010-01-231-16/+18
| | * | git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"Vitaly _Vi Shukela2010-01-071-2/+8
| | * | git-gui: Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-071-4/+3
* | | | Windows: Remove dependency on pthreadGC2.dllMichael Lukashov2010-01-241-1/+3
* | | | Documentation: move away misplaced 'push --upstream' descriptionThomas Rast2010-01-241-7/+7
* | | | Documentation: add missing :: in config.txtThomas Rast2010-01-241-1/+1
* | | | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano2010-01-243-80/+102
|\ \ \ \
| * | | | Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder2010-01-241-6/+8
| * | | | Documentation: simplify How Merge WorksJonathan Nieder2010-01-241-36/+16
| * | | | Documentation: merge: add a section about fast-forwardJonathan Nieder2010-01-241-13/+18
| * | | | Documentation: emphasize when git merge terminates earlyJonathan Nieder2010-01-241-10/+21
| * | | | Documentation: merge: add an overviewJonathan Nieder2010-01-241-2/+26
| * | | | Documentation: merge: move merge strategy list to endJonathan Nieder2010-01-241-2/+2
| * | | | Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder2010-01-241-3/+3
| * | | | Documentation: merge: move configuration section to endJonathan Nieder2010-01-241-9/+9
| * | | | Documentation: emphasise 'git shortlog' in its synopsisThomas Rast2010-01-101-1/+1
| * | | | Documentation: show-files is now called git-ls-filesThomas Rast2010-01-101-1/+1
| * | | | Documentation: tiny git config manual tweaksJonathan Nieder2010-01-101-4/+4
| * | | | Documentation: git gc packs refs by default nowJonathan Nieder2010-01-101-9/+6
* | | | | pull: re-fix command line generationJunio C Hamano2010-01-242-1/+36
* | | | | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-241-4/+4
* | | | | Documentation: rev-list: fix synopsys for --tags and and --remotesChristian Couder2010-01-231-2/+2
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-01-239-162/+1018
|\ \ \ \ \
| * | | | | git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-234-20/+320
| * | | | | git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-234-8/+140
| * | | | | git-svn: update svn mergeinfo test suiteAndrew Myrick2010-01-233-127/+485
| * | | | | git-svn: document --username/commit-url for branch/tagIgor Mironov2010-01-231-0/+13
| * | | | | git-svn: add --username/commit-url options for branch/tagIgor Mironov2010-01-231-2/+6
| * | | | | git-svn: respect commiturl option for branch/tagIgor Mironov2010-01-231-1/+11
| * | | | | git-svn: fix mismatched src/dst errors for branch/tagIgor Mironov2010-01-231-0/+4
| * | | | | git-svn: handle merge-base failuresAndrew Myrick2010-01-231-4/+15
| * | | | | git-svn: ignore changeless commits when checking for a cherry-pickAndrew Myrick2010-01-231-0/+24
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 18:41:02 +0100