summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / /
* | | | | | Merge branch 'ar/string-list-foreach'Junio C Hamano2010-08-182-52/+35
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-052-52/+35
* | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-181-6/+26
|\ \ \ \ \ \
| * | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-251-5/+24
| * | | | | | builtin/checkout: reword hint for -bTay Ray Chuan2010-06-251-1/+2
* | | | | | | Merge branch 'maint'Junio C Hamano2010-08-122-2/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | push: mention "git pull" in error message for non-fast forwardsMatthieu Moy2010-08-121-2/+2
| * | | | | | index-pack: Don't follow replace refs.Nelson Elhage2010-08-121-0/+2
* | | | | | | Merge branch 'maint'Junio C Hamano2010-08-093-22/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | prune: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-3/+2
| * | | | | | notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-2/+3
| * | | | | | Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2010-08-061-0/+2
| * | | | | | check-ref-format: handle subcommands in separate functionsJonathan Nieder2010-08-061-17/+25
* | | | | | | ls-files: learn a debugging dump formatThomas Rast2010-08-021-0/+9
* | | | | | | builtin/push.c: remove useless temporary variableJared Hance2010-08-021-4/+4
|/ / / / / /
* | | | | | commit: remove full stop from usage help for -uStephen Boyd2010-07-271-1/+1
* | | | | | Clarify help message when no remote is specified in fetch/pull.Matthieu Moy2010-07-271-1/+2
| |_|_|/ / |/| | | |
* | | | | Cast execl*() NULL sentinels to (char *)Thomas Rast2010-07-251-6/+6
| |_|/ / |/| | |
* | | | Merge branch 'jl/add-n-ignore-missing'Junio C Hamano2010-07-191-4/+12
|\ \ \ \