aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-24
|\
| * do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-15
* | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-24
|\ \
| * | verify-tag: document --verboseRené Scharfe2010-11-15
| * | branch: improve --verbose descriptionRené Scharfe2010-11-15
| * | Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-15
| * | add OPT__FORCERené Scharfe2010-11-15
| * | add description parameter to OPT__QUIETRené Scharfe2010-11-15
| * | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-15
| * | add description parameter to OPT__VERBOSERené Scharfe2010-11-15
* | | Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-24
|\ \ \
| * | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-03
| * | | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-03
| * | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-03
| |/ /
* | | Merge branch 'jk/maint-apply-no-binary'Junio C Hamano2010-11-17
|\ \ \
| * | | apply: don't segfault on binary files with missing dataJeff King2010-10-29
* | | | Merge branch 'jk/push-progress'Junio C Hamano2010-11-17
|\ \ \ \
| * | | | push: pass --progress down to git-pack-objectsJeff King2010-10-18
* | | | | Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano2010-11-17
|\ \ \ \ \
| * | | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-18
* | | | | | Merge branch 'jn/send-pack-error'Junio C Hamano2010-11-17
|\ \ \ \ \ \
| * | | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-18
| |/ / / / /
* | | | | | Merge branch 'jk/maint-rev-list-nul'Junio C Hamano2010-11-17
|\ \ \ \ \ \
| * | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-13
| |/ / / / /
* | | | | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-17
|\ \ \ \ \ \
| * | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-29
* | | | | | | Merge branch 'maint'Junio C Hamano2010-11-17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | clean: remove redundant variable baselenNguyễn Thái Ngọc Duy2010-11-17
| * | | | | | clean: avoid quoting twiceNguyễn Thái Ngọc Duy2010-11-16
* | | | | | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive --patienceJustin Frankel2010-08-26
| * | | | | | | ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
| * | | | | | | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-26
* | | | | | | | Sync with 1.7.3.2Junio C Hamano2010-10-21
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix {update,checkout}-index usage stringsŠtěpán Němec2010-10-08
| * | | | | | | Put a space between `<' and argument in pack-objects usage stringŠtěpán Němec2010-10-08
| * | | | | | | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-08
| * | | | | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-08
| | |_|/ / / / | |/| | | | |
* | | | | | | commit-tree: free commit message before exitingJonathan Nieder2010-10-06
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'bc/fix-cherry-pick-root'Junio C Hamano2010-10-06
|\ \ \ \ \ \
| * | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-27
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2010-10-06
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | do not depend on signed integer overflowErik Faye-Lund2010-10-06
| * | | | | init: plug tiny one-time memory leakJonathan Nieder2010-10-06
* | | | | | Merge branch 'maint'Junio C Hamano2010-09-30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix typo in pack-objects' usageJohannes Schindelin2010-09-30
* | | | | | Merge branch 'jk/read-tree-empty'Junio C Hamano2010-09-29
|\ \ \ \ \ \
| * | | | | | read-tree: deprecate syntax without tree-ish argsJan Krüger2010-09-10
* | | | | | | Merge branch 'rr/format-patch-count-without-merges'Junio C Hamano2010-09-29
|\ \ \ \ \ \ \
| * | | | | | | format-patch: Don't go over merge commitsRamkumar Ramachandra2010-08-27