Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revert: improve error message for cherry-pick during cherry-pick | Jonathan Nieder | 2011-11-22 | 1 | -7/+6 |
* | revert: rearrange pick_revisions() for clarity | Jonathan Nieder | 2011-11-22 | 1 | -24/+24 |
* | revert: rename --reset option to --quit | Jonathan Nieder | 2011-11-22 | 1 | -11/+14 |
* | Sync with 1.7.7.4 | Junio C Hamano | 2011-11-18 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'jc/maint-name-rev-all' into maint | Junio C Hamano | 2011-11-18 | 1 | -1/+1 |
| * | Merge branch 'dm/pack-objects-update' into maint | Junio C Hamano | 2011-11-08 | 1 | -19/+55 |
| |\ | |||||
| * \ | Merge branch 'bc/attr-ignore-case' into maint | Junio C Hamano | 2011-11-01 | 2 | -1/+7 |
| |\ \ | |||||
| * \ \ | Merge branch 'cn/fetch-prune' into maint | Junio C Hamano | 2011-11-01 | 2 | -6/+30 |
| |\ \ \ | |||||
* | | | | | do not let git_path clobber errno when reporting errorsjn/git-path-errno | Jonathan Nieder | 2011-11-17 | 2 | -24/+34 |
* | | | | | revert: prettify fatal messages | Ramkumar Ramachandra | 2011-11-15 | 1 | -5/+5 |
* | | | | | Revert "upload-archive: use start_command instead of fork" | Junio C Hamano | 2011-11-15 | 2 | -26/+48 |
* | | | | | Merge branch 'ly/mktree-using-strbuf' | Junio C Hamano | 2011-11-11 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbuf | Junio C Hamano | 2011-11-10 | 1 | -0/+1 |
* | | | | | | Merge branch 'jc/remote-setbranches-usage-fix' | Junio C Hamano | 2011-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remote: fix set-branches usagejc/remote-setbranches-usage-fix | Junio C Hamano | 2011-11-06 | 1 | -1/+1 |
* | | | | | | | Merge branch 'fc/remote-seturl-usage-fix' | Junio C Hamano | 2011-11-08 | 1 | -1/+1 |
* | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-07 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), again | Sebastian Schuberth | 2011-11-07 | 1 | -4/+3 |
* | | | | | | | | receive-pack: do not expect object 0{40} to exist | Junio C Hamano | 2011-11-03 | 1 | -6/+11 |
* | | | | | | | | branch -m: handle no arg properly | Tay Ray Chuan | 2011-11-02 | 1 | -5/+8 |
* | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree' | Junio C Hamano | 2011-11-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | blame.c: Properly initialize strbuf after calling, textconv_object() | Sebastian Schuberth | 2011-10-28 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'ef/mingw-upload-archive' | Junio C Hamano | 2011-11-01 | 2 | -48/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-archive: use start_command instead of fork | Erik Faye-Lund | 2011-10-30 | 2 | -48/+26 |
* | | | | | | | | | Merge branch 'dm/pack-objects-update' | Junio C Hamano | 2011-11-01 | 1 | -19/+55 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | pack-objects: don't traverse objects unnecessarily | Dan McGee | 2011-10-20 | 1 | -6/+12 |
| * | | | | | | | | pack-objects: rewrite add_descendants_to_write_order() iteratively | Dan McGee | 2011-10-18 | 1 | -7/+37 |
| * | | | | | | | | pack-objects: use unsigned int for counter and offset values | Dan McGee | 2011-10-18 | 1 | -6/+6 |
| * | | | | | | | | pack-objects: mark add_to_write_order() as inline | Dan McGee | 2011-10-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/grep-mutex' | Junio C Hamano | 2011-10-27 | 1 | -11/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/grep: simplify lock_and_read_sha1_file() | Junio C Hamano | 2011-10-26 | 1 | -7/+3 |
| * | | | | | | | | | builtin/grep: make lock/unlock into static inline functions | Junio C Hamano | 2011-10-26 | 1 | -5/+23 |
| * | | | | | | | | | git grep: be careful to use mutexes only when they are initialized | Johannes Schindelin | 2011-10-26 | 1 | -4/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | clone: Quote user supplied path in a single quote pair | Richard Hartmann | 2011-10-27 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'jk/argv-array' into maint | Junio C Hamano | 2011-10-26 | 1 | -19/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/run-receive-hook-cleanup' into maint | Junio C Hamano | 2011-10-26 | 1 | -19/+52 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 1 | -7/+21 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'mz/remote-rename' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -7/+21 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 | 3 | -7/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | describe: Refresh the index when run with --dirty | Allan Caffee | 2011-09-23 | 1 | -2/+15 |
| | * | | | | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maint | Junio C Hamano | 2011-09-23 | 1 | -29/+90 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-clone-gitdir' into maint | Junio C Hamano | 2011-09-23 | 2 | -2/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/check-ref-format-print-normalize' into maint | Junio C Hamano | 2011-09-23 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-autofix-tag-in-head' into maint | Junio C Hamano | 2011-10-21 | 3 | -59/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -2/+9 |
| * | | | | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint | Junio C Hamano | 2011-10-21 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-config-explicit-bool-display' into maint | Junio C Hamano | 2011-10-21 | 1 | -7/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |