summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2010-01-262-1/+12
* | | | | | | transport_get(): drop unnecessary check for !remoteJunio C Hamano2010-01-271-1/+1
* | | | | | | Fix remote.<remote>.vcsIlari Liusvaara2010-01-271-6/+5
* | | | | | | Merge branch 'jl/diff-submodule-ignore'Junio C Hamano2010-01-267-8/+85
|\ \ \ \ \ \ \
| * | | | | | | Teach diff --submodule that modified submodule directory is dirtyJens Lehmann2010-01-244-1/+72
| * | | | | | | git diff: Don't test submodule dirtiness with --ignore-submodulesJens Lehmann2010-01-241-4/+6
| * | | | | | | Make ce_uptodate() trustworthy againJunio C Hamano2010-01-243-3/+7
* | | | | | | | work around an obnoxious bash "safety feature" on OpenBSDJunio C Hamano2010-01-261-3/+3
* | | | | | | | fix portability issues with $ in double quotesStephen Boyd2010-01-2612-52/+52
* | | | | | | | grep: use REG_STARTEND (if available) to speed up regexecBenjamin Kramer2010-01-261-1/+8
| |_|_|/ / / / |/| | | | | |
* | | | | | | am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-252-1/+17
* | | | | | | t0022: replace non-portable literal CRStephen Boyd2010-01-251-1/+1
* | | | | | | tests: consolidate CR removal/addition functionsStephen Boyd2010-01-256-58/+37
| |_|_|/ / / |/| | | | |
* | | | | | commit-tree: remove unused #defineStephen Boyd2010-01-251-2/+0
* | | | | | t5541-http-push: make grep expression check for one line onlyTay Ray Chuan2010-01-251-8/+4
* | | | | | rebase: replace antiquated sed invocationStephen Boyd2010-01-251-4/+2
* | | | | | Add test-run-command to .gitignoreAlejandro Riveira Fernández2010-01-251-0/+1
* | | | | | git_connect: use use_shell instead of explicit "sh", "-c"Johannes Sixt2010-01-251-2/+1
* | | | | | gitweb.js: Workaround for IE8 bugv1.7.0-rc0Jakub Narebski2010-01-241-1/+6
* | | | | | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-2419-140/+734
|\ \ \ \ \ \
| * | | | | | read-tree --debug-unpackJunio C Hamano2010-01-073-0/+72
| * | | | | | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-075-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-032-6/+9
| * | | | | | traverse_trees(): handle D/F conflict case sanelyJunio C Hamano2010-01-033-46/+237
| * | | | | | more D/F conflict testsJunio C Hamano2010-01-031-0/+102
| * | | | | | tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-039-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-231-0/+10
| | * | | | | | git-gui: Fix applying a line when all following lines are deletionsJeff Epler2010-01-231-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-061-2/+8
| | * | | | | | git-gui: Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-061-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
View Lorry Controller Status