summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-221-7/+6
* revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-221-24/+24
* revert: rename --reset option to --quitJonathan Nieder2011-11-221-11/+14
* Sync with 1.7.7.4Junio C Hamano2011-11-181-1/+1
|\
| * Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-181-1/+1
| * Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-081-19/+55
| |\
| * \ Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-012-1/+7
| |\ \
| * \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-012-6/+30
| |\ \ \
* | | | | do not let git_path clobber errno when reporting errorsjn/git-path-errnoJonathan Nieder2011-11-172-24/+34
* | | | | revert: prettify fatal messagesRamkumar Ramachandra2011-11-151-5/+5
* | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-152-26/+48
* | | | | Merge branch 'ly/mktree-using-strbuf'Junio C Hamano2011-11-111-0/+1
|\ \ \ \ \
| * | | | | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbufJunio C Hamano2011-11-101-0/+1
* | | | | | Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano2011-11-081-1/+1
|\ \ \ \ \ \
| * | | | | | remote: fix set-branches usagejc/remote-setbranches-usage-fixJunio C Hamano2011-11-061-1/+1
* | | | | | | Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano2011-11-081-1/+1
* | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-071-4/+3
|\ \ \ \ \ \ \
| * | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-071-4/+3
* | | | | | | | receive-pack: do not expect object 0{40} to existJunio C Hamano2011-11-031-6/+11
* | | | | | | | branch -m: handle no arg properlyTay Ray Chuan2011-11-021-5/+8
* | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-011-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-281-1/+3
* | | | | | | | Merge branch 'ef/mingw-upload-archive'Junio C Hamano2011-11-012-48/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-archive: use start_command instead of forkErik Faye-Lund2011-10-302-48/+26
* | | | | | | | | Merge branch 'dm/pack-objects-update'Junio C Hamano2011-11-011-19/+55
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | pack-objects: don't traverse objects unnecessarilyDan McGee2011-10-201-6/+12
| * | | | | | | | pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee2011-10-181-7/+37
| * | | | | | | | pack-objects: use unsigned int for counter and offset valuesDan McGee2011-10-181-6/+6
| * | | | | | | | pack-objects: mark add_to_write_order() as inlineDan McGee2011-10-181-1/+1
* | | | | | | | | Merge branch 'js/grep-mutex'Junio C Hamano2011-10-271-11/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-261-7/+3
| * | | | | | | | | builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-261-5/+23
| * | | | | | | | | git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-261-4/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-271-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-271-2/+2
| * | | | | | | | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-261-19/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-261-7/+21
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-7/+21
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-233-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
| | * | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-231-29/+90
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-232-2/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-231-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-213-59/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
| * | | | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \