| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -2/+2 |
* | | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 | 1 | -8/+8 |
|/ |
|
* | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 1 | -34/+234 |
|\ |
|
| * | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 2010-11-17 | 1 | -0/+23 |
| * | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 1 | -2/+6 |
| * | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 2010-11-17 | 1 | -2/+9 |
| * | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -1/+1 |
| * | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -3/+103 |
| * | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -4/+4 |
| * | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -1/+20 |
| * | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -5/+10 |
| * | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 2010-11-17 | 1 | -23/+5 |
| * | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+54 |
| * | builtin/notes.c: Split notes ref DWIMmery into a separate function | Johan Herland | 2010-11-17 | 1 | -6/+11 |
| * | notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond | Johan Herland | 2010-11-17 | 1 | -5/+6 |
* | | add OPT__FORCE | René Scharfe | 2010-11-15 | 1 | -2/+2 |
* | | add description parameter to OPT__DRY_RUN | René Scharfe | 2010-11-15 | 1 | -2/+1 |
* | | add description parameter to OPT__VERBOSE | René Scharfe | 2010-11-15 | 1 | -1/+1 |
* | | notes: Don't create (empty) commit when removing non-existing notes | Johan Herland | 2010-08-31 | 1 | -4/+10 |
|/ |
|
* | notes: allow --dry-run for -n and --verbose for -v | René Scharfe | 2010-08-09 | 1 | -2/+3 |
* | Merge branch 'maint' | Junio C Hamano | 2010-06-28 | 1 | -0/+4 |
|\ |
|
| * | notes: check number of parameters to "git notes copy" | Jeff King | 2010-06-28 | 1 | -0/+4 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-06-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | msvc: Fix some "expr evaluates to function" compiler warnings | Ramsay Jones | 2010-06-24 | 1 | -1/+1 |
* | | Merge 'maint' updates in | Junio C Hamano | 2010-06-16 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | notes: Initialize variable to appease Sun Studio | Ævar Arnfjörð Bjarmason | 2010-06-15 | 1 | -1/+1 |
* | | notes: dry-run and verbose options for prune | Michael J Gruber | 2010-05-19 | 1 | -4/+9 |
|/ |
|
* | Merge branch 'sb/notes-parse-opt' | Junio C Hamano | 2010-03-28 | 1 | -159/+371 |
* | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -1/+196 |
* | Merge branch 'jh/notes' | Junio C Hamano | 2010-03-15 | 1 | -0/+455 |