Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 1 | -2/+29 |
|\ | |||||
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 1 | -2/+29 |
* | | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 | 2 | -14/+9 |
|\ \ | |||||
| * | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 2 | -14/+9 |
* | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 1 | -3/+1 |
| * | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 | 1 | -1/+2 |
| |\ \ \ | |||||
* | \ \ \ | 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 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 2 | -106/+128 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-asked | Dave Borowitz | 2015-08-19 | 2 | -15/+62 |
| * | | | | | | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 | 2 | -3/+23 |
| * | | | | | | | | builtin/send-pack.c: use parse_options API | Dave Borowitz | 2015-08-19 | 1 | -104/+59 |
* | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 1 | -13/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 1 | -1/+13 |
| * | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 1 | -2/+17 |
| * | | | | | | | | | notes: extract parse_notes_merge_strategy to notes-utils | Jacob Keller | 2015-08-17 | 1 | -11/+1 |
* | | | | | | | | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 | 4 | -34/+48 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fix | Junio C Hamano | 2015-08-25 | 2 | -6/+6 |
| * | | | | | | | | | | write_file_v(): do not leave incomplete line at the end | Junio C Hamano | 2015-08-25 | 1 | -8/+2 |
| * | | | | | | | | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 4 | -9/+9 |
| * | | | | | | | | | | 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/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -27/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-config | Heiko Voigt | 2015-08-19 | 1 | -0/+1 |
| * | | | | | | | | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 1 | -45/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | get_urlmatch: avoid useless strbuf writesg/config-name-only | Jeff King | 2015-08-20 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | format_config: simplify buffer handling | Jeff King | 2015-08-20 | 1 | -22/+16 |
| * | | | | | | | | | | | | | | format_config: don't init strbuf | Jeff King | 2015-08-20 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | config: restructure format_config() for better control flow | SZEDER Gábor | 2015-08-20 | 1 | -41/+37 |
| * | | | | | | | | | | | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -2/+12 |
* | | | | | | | | | | | | | | | Merge branch 'jc/calloc-pathspec' | Junio C Hamano | 2015-08-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |