summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'km/fetch-do-not-free-remote-name'Junio C Hamano2016-07-061-4/+2
|\
| * builtin/fetch.c: don't free remote->name after fetchkm/fetch-do-not-free-remote-nameKeith McGuigan2016-06-141-4/+2
| * Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-064-0/+5
| |\
* | \ Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-067-17/+20
|\ \ \
| * | | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-135-10/+10
| * | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-133-10/+10
| |\ \ \
| | * | | blame,shortlog: don't make local option variables staticJeff King2016-06-132-9/+9
| | * | | interpret-trailers: don't duplicate option stringsJeff King2016-06-131-1/+1
* | | | | Merge branch 'pb/commit-editmsg-path'Junio C Hamano2016-07-061-7/+8
|\ \ \ \ \
| * | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-pathPranit Bauva2016-06-091-7/+8
* | | | | | Merge branch 'lf/receive-pack-auto-gc-to-client'Junio C Hamano2016-06-271-2/+13
|\ \ \ \ \ \
| * | | | | | receive-pack: send auto-gc output over sideband 2lf/receive-pack-auto-gc-to-clientLukas Fleischer2016-06-061-2/+13
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-311-6/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-264-14/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-181-1/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-181-9/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-23/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-7/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-021-21/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/deref-tag'Junio C Hamano2016-06-271-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-141-4/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-06-273-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-073-11/+26
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-271-609/+820
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: remove misleading comment on lock_file fieldcc/apply-introduce-stateJunio C Hamano2016-06-061-4/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-031-4/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-031-4/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-011-58/+71
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-011-23/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-011-22/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-011-22/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder2016-06-011-35/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder2016-06-011-24/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder2016-06-011-17/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder2016-06-011-28/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder2016-06-011-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'Christian Couder2016-06-011-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()Christian Couder2016-06-011-5/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'whitespace_option' into 'struct apply_state'Christian Couder2016-06-011-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'whitespace_error' global into 'struct apply_state'Christian Couder2016-06-011-13/+15