aboutsummaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAge
* Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-15
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\
| * Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-17
| * git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
| * git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-17
| * git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
| * git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
| * git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
| * git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
| * git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
| * builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-17
| * git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17
| * builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-17
| * notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-17
* | add OPT__FORCERené Scharfe2010-11-15
* | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-15
* | add description parameter to OPT__VERBOSERené Scharfe2010-11-15
* | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-31
|/
* notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-09
* Merge branch 'maint'Junio C Hamano2010-06-28
|\
| * notes: check number of parameters to "git notes copy"Jeff King2010-06-28
* | Merge branch 'maint'Junio C Hamano2010-06-25
|\ \ | |/
| * msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-24
* | Merge 'maint' updates inJunio C Hamano2010-06-16
|\ \ | |/
| * notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason2010-06-15
* | notes: dry-run and verbose options for pruneMichael J Gruber2010-05-19
|/
* Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-28
* Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
* Merge branch 'jh/notes'Junio C Hamano2010-03-15