Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mg/maint-tag-rfc1991' into maint | Junio C Hamano | 2010-12-10 | 2 | -20/+6 |
|\ | |||||
| * | tag: factor out sig detection for tag display | Michael J Gruber | 2010-11-10 | 1 | -2/+2 |
| * | tag: factor out sig detection for body edits | Michael J Gruber | 2010-11-10 | 1 | -10/+2 |
| * | verify-tag: factor out signature detection | Michael J Gruber | 2010-11-10 | 1 | -8/+2 |
* | | Merge branch 'jn/cherry-pick-refresh-index' into maint | Junio C Hamano | 2010-12-09 | 1 | -2/+16 |
|\ \ | |||||
| * | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 1 | -2/+16 |
| |/ | |||||
* | | Merge branch 'fc/apply-p2-get-header-name' into maint | Junio C Hamano | 2010-12-09 | 1 | -14/+14 |
|\ \ | |||||
| * | | Fix git-apply with -p greater than 1 | Federico Cuello | 2010-11-05 | 1 | -14/+14 |
| |/ | |||||
* | | Merge branch 'np/pack-broken-boundary' into maint | Junio C Hamano | 2010-12-09 | 1 | -1/+15 |
|\ \ | |||||
| * | | make pack-objects a bit more resilient to repo corruption | Nicolas Pitre | 2010-10-22 | 1 | -1/+15 |
| |/ | |||||
* | | Merge branch 'ak/apply-non-git-epoch' into maint | Junio C Hamano | 2010-12-09 | 1 | -6/+29 |
|\ \ | |||||
| * | | apply: handle patches with funny filename and colon in timezone | Jonathan Nieder | 2010-11-10 | 1 | -2/+22 |
| * | | apply: Recognize epoch timestamps with : in the timezone | Anders Kaseorg | 2010-10-13 | 1 | -4/+7 |
* | | | Merge branch 'cb/maint-orphan-merge-noclobber' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+19 |
|\ \ \ | |||||
| * | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -1/+19 |
* | | | | Merge branch 'tr/maint-merge-file-subdir' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 | 1 | -1/+6 |
* | | | | | Merge branch 'ks/no-textconv-symlink' into maint | Junio C Hamano | 2010-12-02 | 2 | -12/+23 |
|\ \ \ \ \ | |||||
| * | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 2 | -12/+23 |
* | | | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-01 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2010-12-01 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2010-12-01 | 1 | -1/+2 |
* | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 1 | -0/+6 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/send-pack-error' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | send-pack: avoid redundant "pack-objects died with strange error" | Jonathan Nieder | 2010-10-18 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 1 | -2/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/revert.c: don't dereference a NULL pointer | Brandon Casey | 2010-09-27 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | clean: remove redundant variable baselen | Nguyễn Thái Ngọc Duy | 2010-11-17 | 1 | -2/+2 |
* | | | | | | | clean: avoid quoting twice | Nguyễn Thái Ngọc Duy | 2010-11-16 | 1 | -2/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Fix {update,checkout}-index usage strings | Štěpán Němec | 2010-10-08 | 2 | -2/+2 |
* | | | | | | Put a space between `<' and argument in pack-objects usage string | Štěpán Němec | 2010-10-08 | 1 | -1/+1 |
* | | | | | | Use parentheses and `...' where appropriate | Štěpán Němec | 2010-10-08 | 8 | -8/+8 |
* | | | | | | Use angles for placeholders consistently | Štěpán Němec | 2010-10-08 | 6 | -12/+12 |
| |/ / / / |/| | | | | |||||
* | | | | | do not depend on signed integer overflow | Erik Faye-Lund | 2010-10-06 | 3 | -3/+3 |
* | | | | | init: plug tiny one-time memory leak | Jonathan Nieder | 2010-10-06 | 1 | -13/+19 |
* | | | | | Fix typo in pack-objects' usage | Johannes Schindelin | 2010-09-30 | 1 | -1/+1 |
* | | | | | Improvements to `git checkout -h` | Daniel Knittl-Frank | 2010-09-27 | 1 | -6/+6 |
|/ / / / | |||||
* | | | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' | Junio C Hamano | 2010-09-15 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | ls-tree $di $dir: do not mistakenly recurse into directories | Junio C Hamano | 2010-09-12 | 1 | -0/+2 |
| |/ / / | |||||
| * | | | revert: Fix trivial comment style issue | Elijah Newren | 2010-09-06 | 1 | -1/+0 |
* | | | | builtin/fetch.c: comment that branch->remote_name is usable when has_merge | Brandon Casey | 2010-09-09 | 1 | -0/+3 |
* | | | | Merge branch 'jh/error-removing-missing-note' | Junio C Hamano | 2010-09-08 | 1 | -4/+10 |
|\ \ \ \ | |||||
| * | | | | notes: Don't create (empty) commit when removing non-existing notes | Johan Herland | 2010-08-31 | 1 | -4/+10 |
* | | | | | Merge branch 'bc/maint-fetch-url-only' | Junio C Hamano | 2010-09-08 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/fetch.c: ignore merge config when not fetching from branch's remote | Brandon Casey | 2010-08-25 | 1 | -1/+3 |
* | | | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-09-08 | 1 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fast-export: ensure that a renamed file is printed after all references | Johannes Sixt | 2010-09-08 | 1 | -1/+9 |