summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-051-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-053-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-2/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-0411-35/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2017-06-041-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-041-20/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/read-tree-empty-with-m' into maintJunio C Hamano2017-06-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano2017-06-043-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/log-decorate-default-to-auto' into maintJunio C Hamano2017-06-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-261-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | status: add optional stash count informationLiam Beguin2017-06-181-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-247-39/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-162-15/+6
| * | | | | | | | | | | | | | | | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-166-24/+12
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-241-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | add: warn when adding an embedded repositoryJeff King2017-06-151-1/+45
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-2478-11/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | config: don't implicitly use gitdir or commondirbw/config-hBrandon Williams2017-06-151-11/+15
| * | | | | | | | | | | | | | | | | | | | | | config: don't include config.h by defaultBrandon Williams2017-06-1578-0/+78
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-242-80/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | ls-files: factor out tag calculationbw/ls-files-sans-the-indexBrandon Williams2017-06-131-16/+25
| * | | | | | | | | | | | | | | | | | | | | ls-files: factor out debug info into a functionBrandon Williams2017-06-131-9/+14
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert show_files to take an indexBrandon Williams2017-06-131-15/+15
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert show_ce_entry to take an indexBrandon Williams2017-06-131-5/+6
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert prune_cache to take an indexBrandon Williams2017-06-131-7/+8
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert ce_excluded to take an indexBrandon Williams2017-06-131-4/+5
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert show_ru_info to take an indexBrandon Williams2017-06-131-4/+4
| * | | | | | | | | | | | | | | | | | | | | ls-files: convert show_other_files to take an indexBrandon Williams2017-06-131-3/+4
View Lorry Controller Status