aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* remote: fix status with branch...rebase=preserveFelipe Contreras2013-12-09
* Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-06
|\
| * diff: restrict pathspec limitations to diff b/f case onlyNguyễn Thái Ngọc Duy2013-11-20
* | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-06
|\ \
| * | for-each-ref: avoid color leakageRamkumar Ramachandra2013-11-19
| * | for-each-ref: introduce %(color:...) for colorRamkumar Ramachandra2013-11-19
| * | for-each-ref: introduce %(upstream:track[short])Ramkumar Ramachandra2013-11-19
| * | for-each-ref: introduce %(HEAD) asterisk markerRamkumar Ramachandra2013-11-18
* | | Merge branch 'gj/push-more-verbose-advice' (early part)Junio C Hamano2013-12-05
|\ \ \
| * | | push: enhance unspecified push default warningGreg Jacobson2013-11-13
* | | | Merge branch 'jc/ref-excludes'Junio C Hamano2013-12-05
|\ \ \ \
| * | | | rev-parse: introduce --exclude=<glob> to tame wildcardsJunio C Hamano2013-11-01
* | | | | Merge branch 'nv/parseopt-opt-arg'Junio C Hamano2013-12-05
|\ \ \ \ \
| * | | | | rev-parse --parseopt: add the --stuck-long modeNicolas Vigier2013-10-31
* | | | | | Merge branch 'jc/merge-base-reflog'Junio C Hamano2013-12-05
|\ \ \ \ \ \
| * | | | | | merge-base: teach "--fork-point" modeJunio C Hamano2013-10-29
| * | | | | | merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano2013-10-23
* | | | | | | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-05
|\ \ \ \ \ \ \
| * | | | | | | checkout: do not die when leaving broken detached HEADJeff King2013-10-24
| * | | | | | | use parse_commit_or_die instead of segfaultingJeff King2013-10-24
| * | | | | | | assume parse_commit checks for NULL commitJeff King2013-10-24
| * | | | | | | assume parse_commit checks commit->object.parsedJeff King2013-10-24
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/literal-pathspecs'Junio C Hamano2013-11-18
|\ \ \ \ \ \ \
| * | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesNguyễn Thái Ngọc Duy2013-10-28
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | branch: fix --verbose output column alignmentTorstein Hegge2013-11-18
* | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-11-06
|\ \ \ \ \ \ \
| * | | | | | | diff: trivial style fixFelipe Contreras2013-10-31
| * | | | | | | describe: trivial style fixesFelipe Contreras2013-10-31
| * | | | | | | branch: trivial style fixFelipe Contreras2013-10-31
| * | | | | | | merge: simplify ff-only optionFelipe Contreras2013-10-31
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/reset-p-current-head-fix'Junio C Hamano2013-11-01
|\ \ \ \ \ \ \
| * | | | | | | reset: pass real rev name to add--interactiveJeff King2013-10-25
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/for-each-ref-skip-parsing'Junio C Hamano2013-11-01
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: avoid loading objects to print %(objectname)Jeff King2013-10-30
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-11-01
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | mv: Fix spurious warning when moving a file in presence of submodulesJens Lehmann2013-10-13
* | | | | | | Merge branch 'nd/lift-path-max'Junio C Hamano2013-10-30
|\ \ \ \ \ \ \
| * | | | | | | checkout_entry(): clarify the use of topath[] parameterJunio C Hamano2013-10-24
| * | | | | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-17
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-10-30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: remove gc.pid file at end of executionJonathan Nieder2013-10-18
* | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano2013-10-30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: proper error message on 'git checkout foo bar --'Matthieu Moy2013-10-18
| * | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-18
* | | | | | | | | | | Merge branch 'fc/styles'Junio C Hamano2013-10-30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | C: have space around && and || operatorsJunio C Hamano2013-10-16
* | | | | | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick: handle "-" after parsing optionsJeff King2013-10-10
* | | | | | | | | | | | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-23
|\ \ \ \ \ \ \ \ \ \ \ \