Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 |
|\ | |||
| * | am: match --signoff to the original scripted version | Junio C Hamano | 2015-09-06 |
* | | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 |
|\ \ | |||
| * | | rerere: release lockfile in non-writing functions | Jeff King | 2015-09-01 |
* | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 |
|\ \ \ | |||
| * | | | commit: don't rewrite shared index unnecessarily | David Turner | 2015-08-31 |
| * | | | Merge branch 'jk/guess-repo-name-regression-fix' into maint | Junio C Hamano | 2015-08-25 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'ah/reflog-typofix-in-error' | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ | |||
| * | | | | | reflog: add missing single quote to error message | Alex Henrie | 2015-08-28 |
* | | | | | | Merge branch 'ah/read-tree-usage-string' | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ \ | |||
| * | | | | | | read-tree: replace bracket set with parentheses to clarify usage | Alex Henrie | 2015-08-28 |
* | | | | | | | Merge branch 'ah/pack-objects-usage-strings' | Junio C Hamano | 2015-09-01 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||
| * | | | | | | pack-objects: place angle brackets around placeholders in usage strings | Alex Henrie | 2015-08-28 |
* | | | | | | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | describe --contains: default to HEAD when no commit-ish is given | SZEDER Gábor | 2015-08-25 |
* | | | | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | push: add a config option push.gpgSign for default signed pushes | Dave Borowitz | 2015-08-19 |
| * | | | | | | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 |
| * | | | | | | | | builtin/send-pack.c: use parse_options API | Dave Borowitz | 2015-08-19 |
* | | | | | | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-17 |
| * | | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 |
| * | | | | | | | | | notes: extract parse_notes_merge_strategy to notes-utils | Jacob Keller | 2015-08-17 |
* | | | | | | | | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | write_file(): drop caller-supplied LF from calls to create a one-liner file | Junio C Hamano | 2015-08-25 |
| * | | | | | | | | | | write_file_v(): do not leave incomplete line at the end | Junio C Hamano | 2015-08-25 |
| * | | | | | | | | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 |
| * | | | | | | | | | | builtin/am: make sure state files are text | Junio C Hamano | 2015-08-24 |
| * | | | | | | | | | | builtin/am: introduce write_state_*() helper functions | Junio C Hamano | 2015-08-24 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jc/log-p-cc' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | builtin/log.c: minor reformat | Junio C Hamano | 2015-08-25 |
| * | | | | | | | | | | log: show merge commit when --cc is given | Junio C Hamano | 2015-08-20 |
| * | | | | | | | | | | log: when --cc is given, default to -p unless told otherwise | Junio C Hamano | 2015-08-20 |
| * | | | | | | | | | | log: rename "tweak" helpers | Junio C Hamano | 2015-08-20 |
* | | | | | | | | | | | Merge branch 'jk/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | rev-list: make it obvious that we do not support notes | Jeff King | 2015-08-24 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'db/send-pack-user-signingkey' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules option | Heiko Voigt | 2015-08-19 |
| * | | | | | | | | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 |
* | | | | | | | | | | | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | get_urlmatch: avoid useless strbuf write | Jeff King | 2015-08-20 |
| * | | | | | | | | | | | | | | format_config: simplify buffer handling | Jeff King | 2015-08-20 |
| * | | | | | | | | | | | | | | format_config: don't init strbuf | Jeff King | 2015-08-20 |
| * | | | | | | | | | | | | | | config: restructure format_config() for better control flow | SZEDER Gábor | 2015-08-20 |
| * | | | | | | | | | | | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 |
* | | | | | | | | | | | | | | | Merge branch 'jc/calloc-pathspec' | Junio C Hamano | 2015-08-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |