Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5004: test ZIP archives with many entries | René Scharfe | 2015-08-28 | 1 | -0/+40 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/p4-fold-case-client-specs' | Junio C Hamano | 2015-09-01 | 2 | -0/+207 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specs | Lars Schneider | 2015-08-28 | 2 | -0/+207 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/submodule-typofix-in-error' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-error | Alex Henrie | 2015-08-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/reflog-typofix-in-error' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog: add missing single quote to error messageah/reflog-typofix-in-error | Alex Henrie | 2015-08-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/read-tree-usage-string' | Junio C Hamano | 2015-09-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-tree: replace bracket set with parentheses to clarify usageah/read-tree-usage-string | Alex Henrie | 2015-08-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/pack-objects-usage-strings' | Junio C Hamano | 2015-09-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: place angle brackets around placeholders in usage stringsah/pack-objects-usage-strings | Alex Henrie | 2015-08-28 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'br/svn-doc-include-paths-config' | Junio C Hamano | 2015-09-01 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-config | Brett Randall | 2015-08-26 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fixup-linked-gitdir' | Junio C Hamano | 2015-09-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup: update the right file in multiple checkoutsnd/fixup-linked-gitdir | Nguyễn Thái Ngọc Duy | 2015-08-25 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.6 | Junio C Hamano | 2015-08-31 | 1 | -0/+39 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 3 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 3 | -6/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 14 | -152/+253 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-asked | Dave Borowitz | 2015-08-19 | 3 | -15/+70 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 | 10 | -49/+128 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/send-pack.c: use parse_options API | Dave Borowitz | 2015-08-19 | 1 | -104/+59 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_... | Dave Borowitz | 2015-08-19 | 2 | -3/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport: remove git_transport_options.push_cert | Dave Borowitz | 2015-08-19 | 2 | -4/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitremote-helpers.txt: document pushcert option | Dave Borowitz | 2015-08-19 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: document --signed | Dave Borowitz | 2015-08-19 | 1 | -1/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-send-pack.txt: wrap long synopsis line | Dave Borowitz | 2015-08-19 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push.txt: document when --signed may fail | Dave Borowitz | 2015-08-19 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 8 | -25/+187 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 4 | -1/+64 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 4 | -3/+76 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller | 2015-08-17 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: extract parse_notes_merge_strategy to notes-utils | Jacob Keller | 2015-08-17 | 3 | -11/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: extract enum notes_merge_strategy to notes-utils.h | Jacob Keller | 2015-08-17 | 2 | -7/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes: document cat_sort_uniq rewriteMode | Jacob Keller | 2015-08-17 | 2 | -4/+5 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 | 10 | -44/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fix | Junio C Hamano | 2015-08-25 | 6 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file_v(): do not leave incomplete line at the end | Junio C Hamano | 2015-08-25 | 2 | -8/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 10 | -19/+40 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/am: make sure state files are text | Junio C Hamano | 2015-08-24 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/am: introduce write_state_*() helper functions | Junio C Hamano | 2015-08-24 | 1 | -27/+41 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-p-cc' | Junio C Hamano | 2015-08-31 | 1 | -9/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/log.c: minor reformatjc/log-p-cc | Junio C Hamano | 2015-08-25 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: show merge commit when --cc is given | Junio C Hamano | 2015-08-20 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: when --cc is given, default to -p unless told otherwise | Junio C Hamano | 2015-08-20 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: rename "tweak" helpers | Junio C Hamano | 2015-08-20 | 1 | -5/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-08-31 | 5 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warnings | Jeff King | 2015-08-24 | 5 | -12/+43 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 | 4 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 4 | -0/+9 |