summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-12-02Merge branch 'cb/maint-orphan-merge-noclobber' into maintLibravatar Junio C Hamano1-1/+19
2010-12-02Merge branch 'tr/maint-merge-file-subdir' into maintLibravatar Junio C Hamano1-1/+6
2010-12-02Merge branch 'ks/no-textconv-symlink' into maintLibravatar Junio C Hamano2-12/+23
2010-12-01Merge branch 'maint-1.7.2' into maintLibravatar Junio C Hamano1-1/+2
2010-12-01Merge branch 'maint-1.7.1' into maint-1.7.2Libravatar Junio C Hamano1-1/+2
2010-12-01Merge branch 'maint-1.7.0' into maint-1.7.1Libravatar Junio C Hamano1-1/+2
2010-11-24Merge branch 'jk/maint-apply-no-binary' into maintLibravatar Junio C Hamano1-0/+6
2010-11-24Merge branch 'jn/send-pack-error' into maintLibravatar Junio C Hamano1-1/+1
2010-11-24Merge branch 'jk/maint-rev-list-nul' into maintLibravatar Junio C Hamano1-2/+4
2010-11-24Merge branch 'bc/fix-cherry-pick-root' into maintLibravatar Junio C Hamano1-1/+1
2010-11-17clean: remove redundant variable baselenLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2010-11-16clean: avoid quoting twiceLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-1/+19
2010-10-29apply: don't segfault on binary files with missing dataLibravatar Jeff King1-0/+6
2010-10-18send-pack: avoid redundant "pack-objects died with strange error"Libravatar Jonathan Nieder1-1/+1
2010-10-18merge-file: correctly find files when called in subdirLibravatar Thomas Rast1-1/+6
2010-10-13rev-list: handle %x00 NUL in user formatLibravatar Jeff King1-2/+4
2010-10-08Fix {update,checkout}-index usage stringsLibravatar Štěpán Němec2-2/+2
2010-10-08Put a space between `<' and argument in pack-objects usage stringLibravatar Štěpán Němec1-1/+1
2010-10-08Use parentheses and `...' where appropriateLibravatar Štěpán Němec8-8/+8
2010-10-08Use angles for placeholders consistentlyLibravatar Štěpán Němec6-12/+12
2010-10-06do not depend on signed integer overflowLibravatar Erik Faye-Lund3-3/+3
2010-10-06init: plug tiny one-time memory leakLibravatar Jonathan Nieder1-13/+19
2010-09-30Fix typo in pack-objects' usageLibravatar Johannes Schindelin1-1/+1
2010-09-29blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Libravatar Kirill Smelkov2-12/+23
2010-09-27Improvements to `git checkout -h`Libravatar Daniel Knittl-Frank1-6/+6
2010-09-27builtin/revert.c: don't dereference a NULL pointerLibravatar Brandon Casey1-1/+1
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Libravatar Junio C Hamano1-0/+2
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesLibravatar Junio C Hamano1-0/+2
2010-09-09builtin/fetch.c: comment that branch->remote_name is usable when has_mergeLibravatar Brandon Casey1-0/+3
2010-09-08Merge branch 'jh/error-removing-missing-note'Libravatar Junio C Hamano1-4/+10
2010-09-08Merge branch 'bc/maint-fetch-url-only'Libravatar Junio C Hamano1-1/+3
2010-09-08Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano1-1/+9
2010-09-08fast-export: ensure that a renamed file is printed after all referencesLibravatar Johannes Sixt1-1/+9
2010-09-06revert: Fix trivial comment style issueLibravatar Elijah Newren1-1/+0
2010-09-06Merge branch 'jh/clean-exclude'Libravatar Junio C Hamano1-1/+1
2010-09-06builtin/clean.c: Use STRING_LIST_INIT_NODUP.Libravatar Thiago Farina1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-4/+17
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano2-4/+2
2010-09-03Merge branch 'nd/clone-depth-zero'Libravatar Junio C Hamano1-2/+5
2010-09-03Merge branch 'jn/apply-filename-with-sp'Libravatar Junio C Hamano1-38/+211
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Libravatar Junio C Hamano1-0/+1
2010-09-03Merge branch 'jn/update-contrib-example-merge'Libravatar Junio C Hamano3-6/+58
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano5-26/+64
2010-09-03Sync with 1.7.2.3Libravatar Junio C Hamano1-1/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Libravatar Thiago Farina1-1/+4
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy2-2/+0
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy2-2/+2
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy2-2/+2
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintLibravatar Junio C Hamano1-5/+16