summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-061-10/+7
|\
| * diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-201-10/+7
* | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-061-13/+81
|\ \
| * | for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-191-5/+23
| * | for-each-ref: introduce %(color:...) for colorRamkumar Ramachandra2013-11-191-2/+9
| * | for-each-ref: introduce %(upstream:track[short])Ramkumar Ramachandra2013-11-191-3/+37
| * | for-each-ref: introduce %(HEAD) asterisk markerRamkumar Ramachandra2013-11-181-2/+11
* | | Merge branch 'gj/push-more-verbose-advice' (early part)Junio C Hamano2013-12-051-0/+7
|\ \ \
| * | | push: enhance unspecified push default warningGreg Jacobson2013-11-131-0/+7
* | | | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-051-0/+16
|\ \ \ \
| * | | | rev-parse: introduce --exclude=<glob> to tame wildcardsjc/ref-excludesJunio C Hamano2013-11-011-0/+17
* | | | | Merge branch 'nv/parseopt-opt-arg'Junio C Hamano2013-12-051-2/+9
|\ \ \ \ \
| * | | | | rev-parse --parseopt: add the --stuck-long modenv/parseopt-opt-argNicolas Vigier2013-10-311-2/+9
* | | | | | Merge branch 'jc/merge-base-reflog'Junio C Hamano2013-12-051-16/+131
|\ \ \ \ \ \
| * | | | | | merge-base: teach "--fork-point" modejc/merge-base-reflogJunio C Hamano2013-10-291-0/+109
| * | | | | | merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano2013-10-231-16/+22
* | | | | | | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-057-17/+14
|\ \ \ \ \ \ \
| * | | | | | | checkout: do not die when leaving broken detached HEADjk/robustify-parse-commitJeff King2013-10-241-4/+4
| * | | | | | | use parse_commit_or_die instead of segfaultingJeff King2013-10-242-4/+4
| * | | | | | | assume parse_commit checks for NULL commitJeff King2013-10-242-3/+3
| * | | | | | | assume parse_commit checks commit->object.parsedJeff King2013-10-243-6/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/literal-pathspecs'Junio C Hamano2013-11-181-1/+3
|\ \ \ \ \ \ \
| * | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecsNguyễn Thái Ngọc Duy2013-10-281-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-181-1/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstreamTorstein Hegge2013-11-181-1/+7
* | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-11-064-16/+7
|\ \ \ \ \ \ \
| * | | | | | | diff: trivial style fixFelipe Contreras2013-10-311-1/+1
| * | | | | | | describe: trivial style fixesFelipe Contreras2013-10-311-4/+3
| * | | | | | | branch: trivial style fixFelipe Contreras2013-10-311-2/+1
| * | | | | | | merge: simplify ff-only optionFelipe Contreras2013-10-311-9/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano2013-11-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | reset: pass real rev name to add--interactivejk/reset-p-current-head-fixJeff King2013-10-251-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2013-11-011-9/+20
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: avoid loading objects to print %(objectname)jk/for-each-ref-skip-parsingJeff King2013-10-301-9/+20
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-11-011-4/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mvJens Lehmann2013-10-131-4/+9
* | | | | | | Merge branch 'nd/lift-path-max'Junio C Hamano2013-10-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | checkout_entry(): clarify the use of topath[] parameternd/lift-path-maxJunio C Hamano2013-10-241-1/+1
| * | | | | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-171-1/+7
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-10-301-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-otherJonathan Nieder2013-10-181-0/+24
* | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano2013-10-301-28/+71
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fixMatthieu Moy2013-10-181-5/+16
| * | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-181-23/+55
* | | | | | | | | | | Merge branch 'fc/styles'Junio C Hamano2013-10-303-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | C: have space around && and || operatorsJunio C Hamano2013-10-163-3/+3
* | | | | | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branchJeff King2013-10-101-2/+2
* | | | | | | | | | | | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-233-18/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | grep: honor --textconv for the case rev:pathmg/more-textconvMichael J Gruber2013-05-101-5/+6
View Lorry Controller Status