summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-319-31/+13
|\
| * merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+1
| * var: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-7/+2
| * ls-remote: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+0
| * index-pack: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-2/+0
| * Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fixJunio C Hamano2010-08-151-19/+5
| |\
| * | config: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+2
| * | bundle: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-4/+2
| * | apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+3
| * | grep: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-4/+2
| * | shortlog: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-111-2/+1
* | | Merge branch 'jn/maint-setup-fix'Junio C Hamano2010-08-311-19/+5
|\ \ \ | | |/ | |/|
| * | Revert "rehabilitate 'git index-pack' inside the object store"Nguyễn Thái Ngọc Duy2010-08-041-19/+5
* | | Merge branch 'en/fast-export-fix'Junio C Hamano2010-08-311-1/+10
|\ \ \
| * | | fast-export: Add a --full-tree optionElijah Newren2010-07-191-1/+3
| * | | fast-export: Fix dropping of files with --import-marks and path limitingElijah Newren2010-07-191-1/+8
* | | | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-311-5/+16
|\ \ \ \
| * | | | rerere: fix overeager gcSZEDER Gábor2010-07-141-5/+16
* | | | | object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Thiago Farina2010-08-293-3/+3
* | | | | Merge branch 'maint'Junio C Hamano2010-08-262-7/+3
|\ \ \ \ \
| * | | | | for-each-ref: fix objectname:short bugJay Soffian2010-08-261-1/+2
| * | | | | Fix 'git log' early pager startup error caseLinus Torvalds2010-08-251-6/+1
* | | | | | Merge branch 'maint'Junio C Hamano2010-08-221-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-221-2/+2
| * | | | | Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-202-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-201-2/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano2010-08-211-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | split_cmdline: Allow caller to access error stringGreg Brockman2010-08-111-1/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sr/local-config'Junio C Hamano2010-08-211-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | config: add --local optionSverre Rabbelier2010-08-041-2/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-212-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-112-0/+2
| * | | | | | | | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-112-2/+2
| * | | | | | | | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-112-2/+2
| |/ / / / / / /
* | | | | | | | builtin/checkout: Fix message when switching to an existing branchRamkumar Ramachandra2010-08-201-1/+4
* | | | | | | | Merge branch 'tf/string-list-init'Junio C Hamano2010-08-1810-21/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-0510-21/+21
* | | | | | | | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-182-30/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-15/+7
| * | | | | | | | | revert: rename variables related to subject in get_message()Christian Couder2010-07-231-5/+5
| * | | | | | | | | revert: refactor code to find commit subject in find_commit_subject()Christian Couder2010-07-231-12/+2
| * | | | | | | | | revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-231-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-185-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-095-0/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-182-2/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | checkout, commit: remove confusing assignments to rev.abbrevJonathan Nieder2010-07-272-2/+0
* | | | | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-181-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add -e/--exclude to git-clean.Jared Hance2010-07-201-1/+16
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-181-2/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-231-2/+1
| |/ / / / / / /