summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-12-011-1/+2
|\
| * Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-011-1/+2
| |\
| | * Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-011-1/+2
| | |\
| | | * Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-011-1/+2
| * | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-241-0/+6
| |\ \ \
| * \ \ \ Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-241-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jl/clone-recurse-sm-synonym'Junio C Hamano2010-11-291-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: Add the --recurse-submodules option as alias for --recursiveJens Lehmann2010-11-051-0/+2
* | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-291-2/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-2/+16
* | | | | | | | | | Merge branch 'np/pack-broken-boundary'Junio C Hamano2010-11-291-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-221-1/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano2010-11-291-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'kb/blame-author-email'Junio C Hamano2010-11-291-6/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: Add option to show author email instead of nameKevin Ballard2010-10-191-6/+22
* | | | | | | | | | | Merge branch 'ak/apply-non-git-epoch'Junio C Hamano2010-11-291-6/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-101-2/+22
| * | | | | | | | | | | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-131-4/+7
* | | | | | | | | | | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-241-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-1/+19
* | | | | | | | | | | | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-2426-49/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | verify-tag: document --verboseRené Scharfe2010-11-151-1/+1
| * | | | | | | | | | | | | branch: improve --verbose descriptionRené Scharfe2010-11-151-1/+2
| * | | | | | | | | | | | | Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-1510-11/+14
| * | | | | | | | | | | | | add OPT__FORCERené Scharfe2010-11-1511-15/+12
| * | | | | | | | | | | | | add description parameter to OPT__QUIETRené Scharfe2010-11-1511-12/+12
| * | | | | | | | | | | | | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-157-9/+7
| * | | | | | | | | | | | | add description parameter to OPT__VERBOSERené Scharfe2010-11-1512-13/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-245-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-034-8/+8
| * | | | | | | | | | | | | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-032-3/+3
| * | | | | | | | | | | | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-031-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/maint-apply-no-binary'Junio C Hamano2010-11-171-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-291-0/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/push-progress'Junio C Hamano2010-11-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: pass --progress down to git-pack-objectsJeff King2010-10-181-0/+3
* | | | | | | | | | | | | Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano2010-11-171-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-181-1/+6
* | | | | | | | | | | | | | Merge branch 'jn/send-pack-error'Junio C Hamano2010-11-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-181-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/maint-rev-list-nul'Junio C Hamano2010-11-171-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-131-2/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-172-12/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-292-12/+23
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-11-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | clean: remove redundant variable baselenNguyễn Thái Ngọc Duy2010-11-171-2/+2
| * | | | | | | | | | clean: avoid quoting twiceNguyễn Thái Ngọc Duy2010-11-161-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |