summaryrefslogtreecommitdiff
path: root/builtin/notes.c
AgeCommit message (Expand)AuthorFilesLines
2011-05-02Merge branch 'jk/notes-ui-updates'Libravatar Junio C Hamano1-10/+0
2011-05-02Merge branch 'jh/notes-add-ui'Libravatar Junio C Hamano1-3/+17
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-55/+57
2011-03-30Make "git notes add" more user-friendly when there are existing notesLibravatar Johan Herland1-3/+17
2011-03-29notes: make expand_notes_ref globally accessibleLibravatar Jeff King1-10/+0
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-2/+2
2011-03-09i18n: git-notes GIT_NOTES_REWRITE_MODE error messageLibravatar Ævar Arnfjörð Bjarmason1-2/+4
2011-03-09i18n: git-notes basic commandsLibravatar Ævar Arnfjörð Bjarmason1-53/+53
2011-02-15Make <identifier> lowercase as per CodingGuidelinesLibravatar Michael J Gruber1-8/+8
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano1-34/+234
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refLibravatar Johan Herland1-0/+23
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-2/+6
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-2/+9
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+1
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-3/+103
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-4/+4
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-1/+20
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-5/+10
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-23/+5
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+54
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionLibravatar Johan Herland1-6/+11
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondLibravatar Johan Herland1-5/+6
2010-11-15add OPT__FORCELibravatar René Scharfe1-2/+2
2010-11-15add description parameter to OPT__DRY_RUNLibravatar René Scharfe1-2/+1
2010-11-15add description parameter to OPT__VERBOSELibravatar René Scharfe1-1/+1
2010-08-31notes: Don't create (empty) commit when removing non-existing notesLibravatar Johan Herland1-4/+10
2010-08-09notes: allow --dry-run for -n and --verbose for -vLibravatar René Scharfe1-2/+3
2010-06-28Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2010-06-28notes: check number of parameters to "git notes copy"Libravatar Jeff King1-0/+4
2010-06-25Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsLibravatar Ramsay Jones1-1/+1
2010-06-16Merge 'maint' updates inLibravatar Junio C Hamano1-1/+1
2010-06-15notes: Initialize variable to appease Sun StudioLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-05-19notes: dry-run and verbose options for pruneLibravatar Michael J Gruber1-4/+9
2010-03-28Merge branch 'sb/notes-parse-opt'Libravatar Junio C Hamano1-159/+371
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano1-1/+196
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano1-0/+455
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:13:24 +0000