Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-apply-no-binary' | Junio C Hamano | 2010-11-17 | 1 | -0/+6 |
|\ | |||||
| * | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 1 | -0/+6 |
* | | Merge branch 'jk/push-progress' | Junio C Hamano | 2010-11-17 | 1 | -0/+3 |
|\ \ | |||||
| * | | push: pass --progress down to git-pack-objects | Jeff King | 2010-10-18 | 1 | -0/+3 |
* | | | Merge branch 'tr/maint-merge-file-subdir' | Junio C Hamano | 2010-11-17 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 | 1 | -1/+6 |
* | | | | Merge branch 'jn/send-pack-error' | Junio C Hamano | 2010-11-17 | 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' | Junio C Hamano | 2010-11-17 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Merge branch 'ks/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 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' | Junio C Hamano | 2010-11-17 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
* | | | | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 3 | -32/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+1 |
| * | | | | | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -1/+1 |
| * | | | | | | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 2 | -31/+3 |
* | | | | | | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-21 | 14 | -22/+22 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | commit-tree: free commit message before exiting | Jonathan Nieder | 2010-10-06 | 1 | -5/+7 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'bc/fix-cherry-pick-root' | Junio C Hamano | 2010-10-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/revert.c: don't dereference a NULL pointer | Brandon Casey | 2010-09-27 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-06 | 4 | -16/+22 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 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 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix typo in pack-objects' usage | Johannes Schindelin | 2010-09-30 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/read-tree-empty' | Junio C Hamano | 2010-09-29 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | read-tree: deprecate syntax without tree-ish args | Jan Krüger | 2010-09-10 | 1 | -1/+9 |
* | | | | | | Merge branch 'rr/format-patch-count-without-merges' | Junio C Hamano | 2010-09-29 | 1 | -6/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: Don't go over merge commits | Ramkumar Ramachandra | 2010-08-27 | 1 | -6/+1 |
* | | | | | | | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 2010-09-29 | 2 | -41/+51 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 2010-09-09 | 2 | -10/+13 |
| * | | | | | | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 | 2 | -17/+28 |
| * | | | | | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len | Ramkumar Ramachandra | 2010-09-09 | 2 | -24/+20 |
* | | | | | | | 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 |
|\ \ \ \ \ \ |