summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-222-3/+3
|\
| * show-branch: fix description of --date-ordertr/do-not-call-submodules-subprojectsThomas Rast2013-07-181-3/+3
| * apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-181-1/+1
* | Merge branch 'mm/color-auto-default'Junio C Hamano2013-07-221-0/+1
|\ \
| * | git add -e: Explicitly specify that patch should have no colormm/color-auto-defaultAndrew Wong2013-07-191-0/+1
* | | Sync with maintJunio C Hamano2013-07-191-1/+1
|\ \ \
| * | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
| * | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-193-6/+6
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-151-1/+1
| |\ \ \
| * \ \ \ Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-031-1/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-181-37/+173
|\ \ \ \ \ \
| * | | | | | cat-file: split --batch input lines on whitespaceJeff King2013-07-121-1/+19
| * | | | | | cat-file: add %(objectsize:disk) format atomJeff King2013-07-121-0/+6
| * | | | | | cat-file: add --batch-check=<format>Jeff King2013-07-121-15/+92
| * | | | | | cat-file: refactor --batch option parsingJeff King2013-07-111-18/+38
| * | | | | | cat-file: teach --batch to stream blob objectsJeff King2013-07-111-13/+28
* | | | | | | Merge branch 'jk/maint-clone-shared-no-connectivity-validation'Junio C Hamano2013-07-181-9/+12
|\ \ \ \ \ \ \
| * | | | | | | clone: drop connectivity check for local clonesjk/maint-clone-shared-no-connectivity-validationJeff King2013-07-081-4/+7
| |/ / / / / /
* | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-151-0/+24
|\ \ \ \ \ \ \
| * | | | | | | teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+24
* | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-151-22/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-22/+33
* | | | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-122-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-032-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-281-0/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-271-20/+22
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-121-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-123-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-263-1/+6
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-111-19/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-241-22/+55
| * | | | | | | | | | | | | commit: make it work with status.shortRamkumar Ramachandra2013-06-241-0/+1
| * | | | | | | | | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
| * | | | | | | | | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-241-0/+7
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-111-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-171-3/+8
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-111-12/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-241-12/+31
* | | | | | | | | | | | | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-012-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | toposort: rename "lifo" fieldJunio C Hamano2013-06-112-7/+9
* | | | | | | | | | | | | Merge branch 'mh/ref-races'Junio C Hamano2013-06-302-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extract a struct stat_data from cache_entryMichael Haggerty2013-06-201-5/+7
| * | | | | | | | | | | | | refs: implement simple transactions for the packed-refs fileMichael Haggerty2013-06-201-1/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nk/name-rev-abbreviated-refs'Junio C Hamano2013-06-301-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | name-rev: allow to specify a subpath for --refs optionNamhyung Kim2013-06-181-7/+29
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-301-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-parse: add --prefix optionJohn Keeping2013-06-171-5/+19
| |/ / / / / / / / / / / /
View Lorry Controller Status