summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-263-32/+5
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive --patienceJustin Frankel2010-08-261-0/+1
| * | | | | | | ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-1/+1
| * | | | | | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-262-31/+3
* | | | | | | | Sync with 1.7.3.2Junio C Hamano2010-10-2114-22/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix {update,checkout}-index usage stringsŠtěpán Němec2010-10-082-2/+2
| * | | | | | | Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec2010-10-081-1/+1
| * | | | | | | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-088-8/+8
| * | | | | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-086-12/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | commit-tree: free commit message before exitingJonathan Nieder2010-10-061-5/+7
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'bc/fix-cherry-pick-root'Junio C Hamano2010-10-061-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-271-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2010-10-064-16/+22
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | do not depend on signed integer overflowErik Faye-Lund2010-10-063-3/+3
| * | | | | init: plug tiny one-time memory leakJonathan Nieder2010-10-061-13/+19
* | | | | | Merge branch 'maint'Junio C Hamano2010-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix typo in pack-objects' usageJohannes Schindelin2010-09-301-1/+1
* | | | | | Merge branch 'jk/read-tree-empty'Junio C Hamano2010-09-291-1/+9
|\ \ \ \ \ \
| * | | | | | read-tree: deprecate syntax without tree-ish argsJan Krüger2010-09-101-1/+9
* | | | | | | Merge branch 'rr/format-patch-count-without-merges'Junio C Hamano2010-09-291-6/+1
|\ \ \ \ \ \ \
| * | | | | | | format-patch: Don't go over merge commitsRamkumar Ramachandra2010-08-271-6/+1