summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland4-3/+24
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland5-4/+394
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland5-13/+474
2010-11-17Documentation: Preliminary docs on 'git notes merge'Libravatar Johan Herland1-1/+43
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland4-2/+559
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland4-11/+532
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland4-24/+47
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland5-0/+392
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionLibravatar Johan Herland1-6/+11
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesLibravatar Johan Herland5-3/+15
2010-11-17(trivial) t3303: Indent with tabs instead of spaces for consistencyLibravatar Johan Herland1-9/+9
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondLibravatar Johan Herland4-37/+43
2010-11-10notes.h/c: Allow combine_notes functions to remove notesLibravatar Johan Herland2-2/+26
2010-11-10notes.c: Reorder functions in preparation for next commitLibravatar Johan Herland1-73/+73
2010-11-10notes.h: Make default_notes_ref() available in notes APILibravatar Johan Herland2-1/+15
2010-11-10(trivial) notes.h: Minor documentation fixes to copy_notes()Libravatar Johan Herland1-0/+5
2010-11-10notes.c: Hexify SHA1 in die() message from init_notes()Libravatar Johan Herland1-1/+1
2010-08-09notes: allow --dry-run for -n and --verbose for -vLibravatar René Scharfe2-2/+5
2010-08-09Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CLibravatar Matthieu Moy2-6/+31
2010-08-09Documentation: cite git-am from git-applyLibravatar Brad King1-0/+10
2010-08-09t7003: fix subdirectory-filter testLibravatar Thomas Rast1-1/+2
2010-08-06Allow "check-ref-format --branch" from subdirectoryLibravatar Jonathan Nieder2-0/+19
2010-08-06check-ref-format: handle subcommands in separate functionsLibravatar Jonathan Nieder1-17/+25
2010-08-05pretty-options.txt: match --format's documentation with implementation.Libravatar Matthieu Moy1-1/+1
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintLibravatar Junio C Hamano1-1/+0
2010-08-03Merge branch 'rr/svn-fe' into maintLibravatar Junio C Hamano3-2/+3
2010-08-03Merge branch 'pt/git-gui' into maintLibravatar Junio C Hamano9-33/+112
2010-08-03contrib/svn-fe: Add the svn-fe target to .gitignoreLibravatar Ramkumar Ramachandra1-0/+1
2010-08-03contrib/svn-fe: Fix IncludePathLibravatar Ramkumar Ramachandra2-2/+2
2010-08-02Merge branch 'ab/tap' into maintLibravatar Junio C Hamano1-4/+3
2010-08-02test-lib: Remove 3 year old no-op --no-python optionLibravatar Ævar Arnfjörð Bjarmason1-3/+0
2010-08-02test-lib: Ignore --quiet under a TAP harnessLibravatar Ævar Arnfjörð Bjarmason1-1/+3
2010-08-02Merge git://repo.or.cz/git-gui into pt/git-guiLibravatar Junio C Hamano9-33/+112
2010-08-02Documentation/rev-parse: quoting is required with --parseoptLibravatar Thomas Rast1-2/+5
2010-08-02Documentation: reporting bugsLibravatar Junio C Hamano1-0/+7
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringLibravatar Junio C Hamano1-1/+0
2010-08-02git-gui: fix size and position of window panes on startupLibravatar Pat Thoyts1-18/+37
2010-08-02git-gui: mc cannot be used before msgcat has been loadedLibravatar Pat Thoyts1-1/+1
2010-07-30git-gui: use textconv filter for diff and blameLibravatar Clément Poulain4-4/+51
2010-07-30git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32Libravatar Pat Thoyts1-3/+8
2010-07-30git-gui: fix shortcut creation on cygwinLibravatar Heiko Voigt1-2/+2
2010-07-30git-gui: fix PATH environment for mingw development environmentLibravatar Heiko Voigt1-2/+3
2010-07-30git-gui: fix usage of _gitworktree when creating shortcut for windowsLibravatar Heiko Voigt1-2/+2
2010-07-30git-gui: fix "Explore Working Copy" for Windows againLibravatar Markus Heidelberg1-1/+1
2010-07-28Fix git rebase --continue to work with touched filesLibravatar David D. Kilzer2-0/+44
2010-07-28Document ls-files -t as semi-obsolete.Libravatar Matthieu Moy1-2/+10
2010-07-27Git 1.7.2.1Libravatar Junio C Hamano4-3/+29
2010-07-27Sync with 1.7.1.2Libravatar Junio C Hamano5-3/+54
2010-07-27Git 1.7.1.2Libravatar Junio C Hamano3-2/+13
2010-07-27Sync with 1.7.0 seriesLibravatar Junio C Hamano4-2/+44
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 08:58:08 +0000