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