summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-2214-52/+279
|\
| * Performance optimization for detection of modified submodulesJens Lehmann2010-01-186-29/+56
| * git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-174-9/+15
| * Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-162-3/+90
| * Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-164-17/+124
* | Merge branch 'il/remote-updates'Junio C Hamano2010-01-223-1/+330
|\ \
| * | Add git remote set-urlIlari Liusvaara2010-01-183-1/+330
* | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-225-13/+64
|\ \ \
| * | | branch: warn and refuse to set a branch as a tracking branch of itself.Matthieu Moy2010-01-181-2/+12
| * | | Add branch --set-upstreamIlari Liusvaara2010-01-185-11/+52
| |/ /
* | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-228-1/+85
|\ \ \
| * | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-213-4/+7
| * | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-208-1/+82
* | | | Merge branch 'nd/ls-files-sparse-fix'Junio C Hamano2010-01-221-3/+13
|\ \ \ \
| * | | | Fix memory corruption when .gitignore does not end by \nNguyễn Thái Ngọc Duy2010-01-201-3/+13
* | | | | Make difftool.prompt fall back to mergetool.promptSebastian Schuberth2010-01-221-1/+2
* | | | | engine.pl: Fix a recent breakage of the buildsystem generatorRamsay Jones2010-01-221-3/+5
* | | | | git-mv: fix moving more than one source to a single destinationJunio C Hamano2010-01-222-4/+19
* | | | | rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-221-1/+1
* | | | | rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-221-1/+1
* | | | | make "index-pack" a built-inLinus Torvalds2010-01-227-15/+16
* | | | | make "git pack-redundant" a built-inLinus Torvalds2010-01-224-7/+5
* | | | | make "git unpack-file" a built-inLinus Torvalds2010-01-224-5/+4
* | | | | make "mktag" a built-inLinus Torvalds2010-01-224-6/+4
* | | | | make "merge-index" a built-inLinus Torvalds2010-01-224-6/+5
* | | | | merge-tree: remove unnecessary call of git_extract_argv0_pathJohannes Sixt2010-01-221-2/+0
* | | | | make "git patch-id" a built-inLinus Torvalds2010-01-214-4/+4
* | | | | make "git var" a built-inLinus Torvalds2010-01-214-4/+4
* | | | | fix git-p4 editor invocationNicolas Pitre2010-01-211-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-01-212-6/+20
|\ \ \ \ \
| * | | | | merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-211-4/+4
| * | | | | retry request without query when info/refs?query failsTay Ray Chuan2010-01-211-2/+16
* | | | | | make "git hash-object" a built-inLinus Torvalds2010-01-214-5/+4
* | | | | | make "git merge-tree" a built-inLinus Torvalds2010-01-214-4/+4
* | | | | | slim down "git show-index"Linus Torvalds2010-01-214-67/+69
* | | | | | Remove diff machinery dependency from read-cacheLinus Torvalds2010-01-212-78/+76
* | | | | | git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* | | | | | Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-212-24/+53
* | | | | | Make test case numbers uniqueJohannes Sixt2010-01-212-0/+0
* | | | | | conflict-marker-size: add test and docsJunio C Hamano2010-01-202-0/+29
* | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-201-1/+45
* | | | | | Merge branch 'bw/cvsimport'Junio C Hamano2010-01-201-35/+35
|\ \ \ \ \ \
| * | | | | | cvsimport: standarize system() calls to external git toolsBen Walton2010-01-191-5/+5
| * | | | | | cvsimport: standarize open() calls to external git toolsBen Walton2010-01-191-4/+4
| * | | | | | cvsimport: modernize callouts to git subcommandsBen Walton2010-01-191-32/+32
* | | | | | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-201-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano2010-01-191-2/+4
* | | | | | | | Merge branch 'ag/patch-header-verify'Junio C Hamano2010-01-202-1/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2010-01-182-1/+39
* | | | | | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-2016-78/+155
|\ \ \ \ \ \ \ \ \