Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP. | Thiago Farina | 2010-09-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 1 | -4/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodules | Jens Lehmann | 2010-08-30 | 1 | -0/+5 |
| * | | | | | | | | checkout: respect diff.ignoreSubmodules setting | Johannes Schindelin | 2010-08-25 | 1 | -4/+12 |
* | | | | | | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 2 | -2/+0 |
| * | | | | | | | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 2 | -2/+2 |
| * | | | | | | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 2 | -2/+2 |
* | | | | | | | | | | Merge branch 'nd/clone-depth-zero' | Junio C Hamano | 2010-09-03 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clone: warn users --depth is ignored in local clones | Nguyễn Thái Ngọc Duy | 2010-08-24 | 1 | -2/+5 |
* | | | | | | | | | | | Merge branch 'jn/apply-filename-with-sp' | Junio C Hamano | 2010-09-03 | 1 | -38/+211 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | apply: handle traditional patches with space in filename | Jonathan Nieder | 2010-08-21 | 1 | -14/+179 |