summaryrefslogtreecommitdiff
path: root/builtin/notes.c
Commit message (Expand)AuthorAgeFilesLines
* notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-191-4/+15
* notes remove: --ignore-missingJunio C Hamano2011-05-191-4/+10
* notes remove: allow removing more than oneJunio C Hamano2011-05-191-22/+25
* Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-10/+0
|\
| * notes: make expand_notes_ref globally accessibleJeff King2011-03-291-10/+0
* | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-021-3/+17
|\ \
| * | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-301-3/+17
| |/
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-55/+57
|\ \ | |/ |/|
| * i18n: git-notes GIT_NOTES_REWRITE_MODE error messageÆvar Arnfjörð Bjarmason2011-03-091-2/+4
| * i18n: git-notes basic commandsÆvar Arnfjörð Bjarmason2011-03-091-53/+53
* | Fix sparse warningsStephen Boyd2011-03-221-2/+2
* | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-151-8/+8
|/
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-34/+234
|\
| * Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-171-0/+23
| * git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-2/+6
| * git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-2/+9
| * git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+1
| * git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-3/+103
| * git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-4/+4
| * git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-1/+20
| * git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-5/+10
| * builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-23/+5
| * git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+54
| * builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-171-6/+11
| * notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-171-5/+6
* | add OPT__FORCERené Scharfe2010-11-151-2/+2
* | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-151-2/+1
* | add description parameter to OPT__VERBOSERené Scharfe2010-11-151-1/+1
* | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-311-4/+10
|/
* notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-2/+3
* Merge branch 'maint'Junio C Hamano2010-06-281-0/+4
|\
| * notes: check number of parameters to "git notes copy"Jeff King2010-06-281-0/+4
* | Merge branch 'maint'Junio C Hamano2010-06-251-1/+1
|\ \ | |/
| * msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-241-1/+1
* | Merge 'maint' updates inJunio C Hamano2010-06-161-1/+1
|\ \ | |/
| * notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason2010-06-151-1/+1
* | notes: dry-run and verbose options for pruneMichael J Gruber2010-05-191-4/+9
|/
* Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-281-159/+371
* Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-1/+196
* Merge branch 'jh/notes'Junio C Hamano2010-03-151-0/+455
View Lorry Controller Status