Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'km/fetch-do-not-free-remote-name' | Junio C Hamano | 2016-07-06 | 1 | -4/+2 |
|\ | |||||
| * | builtin/fetch.c: don't free remote->name after fetchkm/fetch-do-not-free-remote-name | Keith McGuigan | 2016-06-14 | 1 | -4/+2 |
| * | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 | 4 | -0/+5 |
| |\ | |||||
* | \ | Merge branch 'jk/string-list-static-init' | Junio C Hamano | 2016-07-06 | 7 | -17/+20 |
|\ \ \ | |||||
| * | | | use string_list initializer consistentlyjk/string-list-static-init | Jeff King | 2016-06-13 | 5 | -10/+10 |
| * | | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init | Junio C Hamano | 2016-06-13 | 3 | -10/+10 |
| |\ \ \ | |||||
| | * | | | blame,shortlog: don't make local option variables static | Jeff King | 2016-06-13 | 2 | -9/+9 |
| | * | | | interpret-trailers: don't duplicate option strings | Jeff King | 2016-06-13 | 1 | -1/+1 |
* | | | | | Merge branch 'pb/commit-editmsg-path' | Junio C Hamano | 2016-07-06 | 1 | -7/+8 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-path | Pranit Bauva | 2016-06-09 | 1 | -7/+8 |
* | | | | | | Merge branch 'lf/receive-pack-auto-gc-to-client' | Junio C Hamano | 2016-06-27 | 1 | -2/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | receive-pack: send auto-gc output over sideband 2lf/receive-pack-auto-gc-to-client | Lukas Fleischer | 2016-06-06 | 1 | -2/+13 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'js/name-rev-use-oldest-ref' into maint | Junio C Hamano | 2016-05-31 | 1 | -6/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'lp/typofixes' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'va/i18n-misc-updates' into maint | Junio C Hamano | 2016-05-26 | 4 | -14/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'va/i18n-remote-comment-to-align' into maint | Junio C Hamano | 2016-05-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -9/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/replace-edit-use-editor-configuration' into maint | Junio C Hamano | 2016-05-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/apply' into maint | Junio C Hamano | 2016-05-06 | 1 | -15/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ad/commit-have-m-option' into maint | Junio C Hamano | 2016-05-02 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into maint | Junio C Hamano | 2016-05-02 | 1 | -23/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/branch-shortening-funny-symrefs' into maint | Junio C Hamano | 2016-05-02 | 1 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ky/branch-m-worktree' into maint | Junio C Hamano | 2016-05-02 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ky/branch-d-worktree' into maint | Junio C Hamano | 2016-05-02 | 1 | -8/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/check-repository-format' into maint | Junio C Hamano | 2016-05-02 | 1 | -21/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/send-pack-all-fix' into maint | Junio C Hamano | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/deref-tag' | Junio C Hamano | 2016-06-27 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tag | Junio C Hamano | 2016-06-14 | 1 | -4/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'et/add-chmod-x' | Junio C Hamano | 2016-06-27 | 3 | -11/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | add: add --chmod=+x / --chmod=-x options | Edward Thomson | 2016-06-07 | 3 | -11/+26 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/apply-introduce-state' | Junio C Hamano | 2016-06-27 | 1 | -609/+820 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: remove misleading comment on lock_file fieldcc/apply-introduce-state | Junio C Hamano | 2016-06-06 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'newfd' global into 'struct apply_state' | Christian Couder | 2016-06-03 | 1 | -4/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: add 'lock_file' pointer into 'struct apply_state' | Christian Couder | 2016-06-03 | 1 | -4/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move applying patches into apply_all_patches() | Christian Couder | 2016-06-01 | 1 | -58/+71 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'state' check into check_apply_state() | Christian Couder | 2016-06-01 | 1 | -23/+29 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'symlink_changes' global into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -22/+28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'fn_table' global into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -22/+25 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'state_linenr' global into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -35/+36 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -24/+25 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'ws_ignore_action' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -17/+20 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'ws_error_action' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -28/+33 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -11/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: remove whitespace_option arg from set_default_whitespace_mode() | Christian Couder | 2016-06-01 | 1 | -5/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'whitespace_option' into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -7/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/apply: move 'whitespace_error' global into 'struct apply_state' | Christian Couder | 2016-06-01 | 1 | -13/+15 |