aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-13
|\
| * builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-27
| * pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-23
| * builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-23
| * builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-23
* | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-13
|\ \
| * | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-30
* | | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-13
|\ \ \
| * | | grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-30
| |/ /
* | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-12
|\ \ \
| * | | use DIV_ROUND_UPRené Scharfe2017-07-10
* | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-12
|\ \ \ \
| * | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-09
| * | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-09
| * | | | branch: only perform HEAD check for local branchesJeff King2017-07-09
* | | | | Merge branch 'ks/typofix-commit-c-comment'Junio C Hamano2017-07-10
|\ \ \ \ \
| * | | | | builtin/commit.c: fix a typo in the commentKaartic Sivaraam2017-07-06
| | |/ / / | |/| | |
| * | | | Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-24
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-24
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ab/wildmatch'Junio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason2017-06-23
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-template: distinguish status information unconditionallyKaartic Sivaraam2017-06-30
| * | | | | | | | commit-template: remove outdated notice about explicit pathsKaartic Sivaraam2017-06-30
* | | | | | | | | Merge branch 'jc/utf8-fprintf'Junio C Hamano2017-07-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule--helper: do not call utf8_fprintf() unnecessarilyJunio C Hamano2017-06-28
* | | | | | | | | | Merge branch 'jt/unify-object-info'Junio C Hamano2017-07-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: refactor has_sha1_file_with_flagsJonathan Tan2017-06-26
| * | | | | | | | | | sha1_file: rename LOOKUP_REPLACE_OBJECTJonathan Tan2017-06-21
| * | | | | | | | | | sha1_file: rename LOOKUP_UNKNOWN_OBJECTJonathan Tan2017-06-21
* | | | | | | | | | | Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano2017-07-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_file: guard against invalid loose subdirectory numbersRené Scharfe2017-06-24
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: use repository objectBrandon Williams2017-06-23
| * | | | | | | | | | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-23
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-23
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/typofixes'Junio C Hamano2017-06-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Spelling fixesVille Skyttä2017-06-27
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | status: contextually notify user about an initial commitKaartic Sivaraam2017-06-21
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/bug-to-abort' into maintJunio C Hamano2017-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \