| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'tk/stripspace' | Junio C Hamano | 2015-10-26 | 1 | -3/+3 |
|\ |
|
| * | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 | 1 | -3/+3 |
* | | worktree: add top-level worktree.c | Michael Rappazzo | 2015-10-02 | 1 | -1/+1 |
|/ |
|
* | 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 'dt/notes-multiple' | Junio C Hamano | 2015-08-25 | 1 | -0/+6 |
|\ \
| |/
|/| |
|
| * | notes: handle multiple worktreesdt/notes-multiple | David Turner | 2015-08-11 | 1 | -0/+6 |
* | | standardize usage info string format | Alex Henrie | 2015-01-14 | 1 | -12/+12 |
* | | builtin/notes: add --allow-empty, to allow storing empty notes | Johan Herland | 2014-11-12 | 1 | -6/+11 |
* | | builtin/notes: split create_note() to clarify add vs. remove logic | Johan Herland | 2014-11-12 | 1 | -49/+54 |
* | | builtin/notes: simplify early exit code in add() | Johan Herland | 2014-11-12 | 1 | -18/+17 |
* | | builtin/notes: refactor note file path into struct note_data | Johan Herland | 2014-11-10 | 1 | -17/+21 |
* | | builtin/notes: improve naming | Johan Herland | 2014-11-10 | 1 | -55/+54 |
* | | builtin/notes: fix premature failure when trying to add the empty blob | Johan Herland | 2014-11-10 | 1 | -1/+1 |
|/ |
|
* | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 | 1 | -1/+1 |
* | Merge branch 'ah/grammofix' | Junio C Hamano | 2014-09-19 | 1 | -1/+1 |
|\ |
|
| * | grammofix in user-facing messagesah/grammofix | Alex Henrie | 2014-09-02 | 1 | -1/+1 |
* | | run-command: introduce CHILD_PROCESS_INIT | René Scharfe | 2014-08-20 | 1 | -2/+1 |
|/ |
|
* | Merge branch 'mh/ref-transaction' | Junio C Hamano | 2014-06-03 | 1 | -3/+3 |
|\ |
|
| * | refs.h: rename the action_on_err constants | Michael Haggerty | 2014-04-07 | 1 | -3/+3 |
* | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'jh/note-trees-record-blobs' | Junio C Hamano | 2014-03-14 | 1 | -1/+5 |
|\ |
|
| * | notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobs | Johan Herland | 2014-02-20 | 1 | -1/+5 |
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -1/+1 |
* | | Replace deprecated OPT_BOOLEAN by OPT_BOOL | Stefan Beller | 2013-08-05 | 1 | -2/+2 |
* | | Remove deprecated OPTION_BOOLEAN for parsing arguments | Stefan Beller | 2013-08-05 | 1 | -4/+4 |
|/ |
|
* | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 2013-06-26 | 1 | -1/+1 |
|\ |
|
| * | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 1 | -1/+1 |
* | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c | Johan Herland | 2013-06-12 | 1 | -130/+1 |
* | | finish_copy_notes_for_rewrite(): Let caller provide commit message | Johan Herland | 2013-06-12 | 1 | -4/+5 |
* | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 1 | -19/+15 |
|/ |
|
* | builtin/notes.c: mark file-scope private symbols as static | Junio C Hamano | 2012-09-15 | 1 | -2/+5 |
* | Reduce translations by using same terminologies | Nguyễn Thái Ngọc Duy | 2012-08-22 | 1 | -2/+2 |
* | i18n: notes: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 | 1 | -60/+60 |
* | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | 1 | -2/+2 |
|\ |
|
| * | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 | 1 | -2/+2 |
* | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 | 1 | -3/+4 |
* | | Copy resolve_ref() return value for longer use | Nguyễn Thái Ngọc Duy | 2011-12-05 | 1 | -1/+5 |
|/ |
|
* | notes remove: --stdin reads from the standard input | Junio C Hamano | 2011-05-19 | 1 | -4/+15 |
* | notes remove: --ignore-missing | Junio C Hamano | 2011-05-19 | 1 | -4/+10 |
* | notes remove: allow removing more than one | Junio C Hamano | 2011-05-19 | 1 | -22/+25 |
* | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -10/+0 |
|\ |
|
| * | notes: make expand_notes_ref globally accessible | Jeff King | 2011-03-29 | 1 | -10/+0 |
* | | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 2011-05-02 | 1 | -3/+17 |
|\ \ |
|
| * | | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 2011-03-30 | 1 | -3/+17 |
| |/ |
|
* | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 1 | -55/+57 |
|\ \
| |/
|/| |
|
| * | i18n: git-notes GIT_NOTES_REWRITE_MODE error message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+4 |
| * | i18n: git-notes basic commands | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -53/+53 |