summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/gc-pre-detach-under-hook'Junio C Hamano2017-07-181-0/+4
|\
| * gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-121-0/+4
| * Merge branch 'jc/utf8-fprintf' into maintJunio C Hamano2017-07-101-3/+2
| |\
* | \ Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-132-35/+74
|\ \ \
| * | | builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-271-3/+2
| * | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-10/+63
| * | | builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-231-9/+10
| * | | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-231-16/+2
* | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-133-15/+24
|\ \ \ \
| * | | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-303-15/+24
* | | | | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-131-2/+0
|\ \ \ \ \
| * | | | | grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-301-2/+0
| |/ / / /
* | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-124-4/+4
|\ \ \ \ \
| * | | | | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-104-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-121-6/+9
|\ \ \ \ \
| * | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-091-2/+3
| * | | | | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | | | | Merge branch 'ks/typofix-commit-c-comment'Junio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-commentKaartic Sivaraam2017-07-061-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-241-3/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-244-36/+42
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-241-7/+52
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ab/wildmatch'Junio C Hamano2017-07-106-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-236-7/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2017-07-101-8/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removalKaartic Sivaraam2017-06-301-2/+1
| * | | | | | | | | commit-template: remove outdated notice about explicit pathsKaartic Sivaraam2017-06-301-6/+0
* | | | | | | | | | Merge branch 'jc/utf8-fprintf'Junio C Hamano2017-07-061-3/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintfJunio C Hamano2017-06-281-3/+2
* | | | | | | | | | Merge branch 'jt/unify-object-info'Junio C Hamano2017-07-053-8/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: refactor has_sha1_file_with_flagsjt/unify-object-infoJonathan Tan2017-06-262-5/+8
| * | | | | | | | | | sha1_file: rename LOOKUP_REPLACE_OBJECTJonathan Tan2017-06-211-2/+3
| * | | | | | | | | | sha1_file: rename LOOKUP_UNKNOWN_OBJECTJonathan Tan2017-06-211-1/+1
* | | | | | | | | | | Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano2017-07-053-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_file: guard against invalid loose subdirectory numbersrs/sha1-name-readdir-optimRené Scharfe2017-06-243-3/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-053-119/+85
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-231-114/+78
| * | | | | | | | | | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-232-5/+7
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-2378-91/+194
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/typofixes'Junio C Hamano2017-06-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-271-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-211-0/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-131-11/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-131-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-052-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status