summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-123-108/+40
|\
| * Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-052-2/+10
| |\
| * | stop installing git-tar-tree linkJonathan Nieder2013-12-031-0/+0
| * | tar-tree: remove deprecated commandJohn Keeping2013-11-121-62/+0
| * | repo-config: remove deprecated alias for "git config"John Keeping2013-11-121-6/+0
* | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-122-246/+248
|\ \ \
| * | | ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-301-3/+1
| * | | fetch, remote: properly convey --no-prune options to subprocessesMichael Haggerty2013-10-302-5/+5
| * | | builtin/remote.c:update(): use struct argv_arrayMichael Haggerty2013-10-301-16/+17
| * | | builtin/remote.c: reorder function definitionsMichael Haggerty2013-10-301-81/+78
| * | | fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-301-30/+9
| * | | fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-301-24/+35
| * | | fetch: only opportunistically update references based on command lineMichael Haggerty2013-10-301-12/+32
| * | | builtin/fetch.c: reorder function definitionsMichael Haggerty2013-10-301-101/+97
| * | | get_ref_map(): rename local variablesMichael Haggerty2013-10-241-6/+6
* | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
View Lorry Controller Status