aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'fc/trivial'Junio C Hamano2013-12-17
|\
| * remote: fix status with branch...rebase=preserveFelipe Contreras2013-12-09
* | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-12
|\ \
| * \ Sync with 1.8.5Junio C Hamano2013-12-05
| |\ \
| * | | stop installing git-tar-tree linkJonathan Nieder2013-12-03
| * | | tar-tree: remove deprecated commandJohn Keeping2013-11-12
| * | | repo-config: remove deprecated alias for "git config"John Keeping2013-11-12
* | | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-12
|\ \ \ \ | |_|_|/ |/| | |
| * | | ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-30
| * | | fetch, remote: properly convey --no-prune options to subprocessesMichael Haggerty2013-10-30
| * | | builtin/remote.c:update(): use struct argv_arrayMichael Haggerty2013-10-30
| * | | builtin/remote.c: reorder function definitionsMichael Haggerty2013-10-30
| * | | fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-30
| * | | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-30
| * | | fetch: only opportunistically update references based on command lineMichael Haggerty2013-10-30
| * | | builtin/fetch.c: reorder function definitionsMichael Haggerty2013-10-30
| * | | get_ref_map(): rename local variablesMichael Haggerty2013-10-24
* | | | 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
|\ \ \ \ \ \ \