summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | | | | | | ls-files: convert show_killed_files to take an indexBrandon Williams2017-06-131-10/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | ls-files: convert write_eolinfo to take an indexBrandon Williams2017-06-131-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-132-8/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | tree: convert read_tree to take an index parameterBrandon Williams2017-06-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-131-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-221-10/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | dir: create function count_slashes()pc/dir-count-slashesPrathamesh Chavan2017-06-121-10/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-199-8/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | diff- and log- family: handle "git cmd -h" earlyJunio C Hamano2017-06-054-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: show usage for "-h"Jeff King2017-05-301-3/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | remote-{ext,fd}: print usage message on invalid argumentsJeff King2017-05-302-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | upload-archive: handle "-h" option earlyJeff King2017-05-301-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | credential: handle invalid arguments earlierJeff King2017-05-301-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-199-104/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/diff-tree: cleanup references to sha1Brandon Williams2017-06-051-5/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-056-22/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-051-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams2017-06-021-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | patch-ids: convert to struct object_idBrandon Williams2017-06-021-1/+1