Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-12-01 | 1 | -1/+2 |
|\ | |||||
| * | 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 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jn/send-pack-error' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 1 | -2/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'bc/fix-cherry-pick-root' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jl/clone-recurse-sm-synonym' | Junio C Hamano | 2010-11-29 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: Add the --recurse-submodules option as alias for --recursive | Jens Lehmann | 2010-11-05 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index' | Junio C Hamano | 2010-11-29 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 1 | -2/+16 |
* | | | | | | | | | | Merge branch 'np/pack-broken-boundary' | Junio C Hamano | 2010-11-29 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | make pack-objects a bit more resilient to repo corruption | Nicolas Pitre | 2010-10-22 | 1 | -1/+15 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name' | Junio C Hamano | 2010-11-29 | 1 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix git-apply with -p greater than 1 | Federico Cuello | 2010-11-05 | 1 | -14/+14 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'kb/blame-author-email' | Junio C Hamano | 2010-11-29 | 1 | -6/+22 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | blame: Add option to show author email instead of name | Kevin Ballard | 2010-10-19 | 1 | -6/+22 |
* | | | | | | | | | | | Merge branch 'ak/apply-non-git-epoch' | Junio C Hamano | 2010-11-29 | 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' | Junio C Hamano | 2010-11-24 | 1 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -1/+19 |
* | | | | | | | | | | | | | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-24 | 26 | -49/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | verify-tag: document --verbose | René Scharfe | 2010-11-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | branch: improve --verbose description | René Scharfe | 2010-11-15 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Describe various forms of "be quiet" using OPT__QUIET | Jonathan Nieder | 2010-11-15 | 10 | -11/+14 |
| * | | | | | | | | | | | | | add OPT__FORCE | René Scharfe | 2010-11-15 | 11 | -15/+12 |
| * | | | | | | | | | | | | | add description parameter to OPT__QUIET | René Scharfe | 2010-11-15 | 11 | -12/+12 |
| * | | | | | | | | | | | | | add description parameter to OPT__DRY_RUN | René Scharfe | 2010-11-15 | 7 | -9/+7 |
| * | | | | | | | | | | | | | add description parameter to OPT__VERBOSE | René Scharfe | 2010-11-15 | 12 | -13/+13 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'mm/phrase-remote-tracking' | Junio C Hamano | 2010-11-24 | 5 | -12/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 2010-11-03 | 4 | -8/+8 |
| * | | | | | | | | | | | | | Change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 2 | -3/+3 |
| * | | | | | | | | | | | | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | |