aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* revert: remove --reset compatibility optionJonathan Nieder2011-11-22
* revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-22
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-22
* revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-22
* revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-22
* revert: rename --reset option to --quitJonathan Nieder2011-11-22
* Sync with 1.7.7.4Junio C Hamano2011-11-18
|\
| * Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-18
| * Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-08
| |\
| * \ Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-01
| |\ \
| * \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-01
| |\ \ \
* | | | | do not let git_path clobber errno when reporting errorsJonathan Nieder2011-11-17
* | | | | revert: prettify fatal messagesRamkumar Ramachandra2011-11-15
* | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-15
* | | | | Merge branch 'ly/mktree-using-strbuf'Junio C Hamano2011-11-11
|\ \ \ \ \
| * | | | | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Junio C Hamano2011-11-10
* | | | | | Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano2011-11-08
|\ \ \ \ \ \
| * | | | | | remote: fix set-branches usageJunio C Hamano2011-11-06
* | | | | | | Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano2011-11-08
* | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-07
|\ \ \ \ \ \ \
| * | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-07
* | | | | | | | receive-pack: do not expect object 0{40} to existJunio C Hamano2011-11-03
* | | | | | | | branch -m: handle no arg properlyTay Ray Chuan2011-11-02
* | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-01
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-28
* | | | | | | | Merge branch 'ef/mingw-upload-archive'Junio C Hamano2011-11-01
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-archive: use start_command instead of forkErik Faye-Lund2011-10-30
* | | | | | | | | Merge branch 'dm/pack-objects-update'Junio C Hamano2011-11-01
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | pack-objects: don't traverse objects unnecessarilyDan McGee2011-10-20
| * | | | | | | | pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee2011-10-18
| * | | | | | | | pack-objects: use unsigned int for counter and offset valuesDan McGee2011-10-18
| * | | | | | | | pack-objects: mark add_to_write_order() as inlineDan McGee2011-10-18
* | | | | | | | | Merge branch 'js/grep-mutex'Junio C Hamano2011-10-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-26
| * | | | | | | | | builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-26
| * | | | | | | | | git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-26
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-27
| * | | | | | | | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-26
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-26
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-23
| | * | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-21
| * | | | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \