summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-175-4/+394
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-175-13/+474
* Documentation: Preliminary docs on 'git notes merge'Johan Herland2010-11-171-1/+43
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-174-2/+559
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-174-11/+532
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-174-24/+47
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-175-0/+392
* builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-171-6/+11
* notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-175-3/+15
* (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland2010-11-171-9/+9
* notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-174-37/+43
* notes.h/c: Allow combine_notes functions to remove notesJohan Herland2010-11-102-2/+26
* notes.c: Reorder functions in preparation for next commitJohan Herland2010-11-101-73/+73
* notes.h: Make default_notes_ref() available in notes APIJohan Herland2010-11-102-1/+15
* (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland2010-11-101-0/+5
* notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland2010-11-101-1/+1
* notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-092-2/+5
* Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy2010-08-092-6/+31
* Documentation: cite git-am from git-applyBrad King2010-08-091-0/+10
* t7003: fix subdirectory-filter testThomas Rast2010-08-091-1/+2
* Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2010-08-062-0/+19
* check-ref-format: handle subcommands in separate functionsJonathan Nieder2010-08-061-17/+25
* pretty-options.txt: match --format's documentation with implementation.Matthieu Moy2010-08-051-1/+1
* Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano2010-08-031-1/+0
|\
| * Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano2010-08-021-1/+0
* | Merge branch 'rr/svn-fe' into maintJunio C Hamano2010-08-033-2/+3
|\ \
| * | contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra2010-08-031-0/+1
| * | contrib/svn-fe: Fix IncludePathRamkumar Ramachandra2010-08-032-2/+2
* | | Merge branch 'pt/git-gui' into maintJunio C Hamano2010-08-039-33/+112
|\ \ \
| * \ \ Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano2010-08-029-33/+112
| |\ \ \
| | * | | git-gui: fix size and position of window panes on startupPat Thoyts2010-08-021-18/+37
| | * | | git-gui: mc cannot be used before msgcat has been loadedPat Thoyts2010-08-021-1/+1
| | * | | git-gui: use textconv filter for diff and blameClément Poulain2010-07-304-4/+51
| | * | | git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32Pat Thoyts2010-07-301-3/+8
| | * | | git-gui: fix shortcut creation on cygwinHeiko Voigt2010-07-301-2/+2
| | * | | git-gui: fix PATH environment for mingw development environmentHeiko Voigt2010-07-301-2/+3
| | * | | git-gui: fix usage of _gitworktree when creating shortcut for windowsHeiko Voigt2010-07-301-2/+2
| | * | | git-gui: fix "Explore Working Copy" for Windows againMarkus Heidelberg2010-07-301-1/+1
| | * | | git-gui: fix usage of themed widgets variableHeiko Voigt2010-07-101-0/+1
| | * | | git-gui: Handle failure of core.worktree to identify the working directory.Pat Thoyts2010-07-101-0/+3
| | * | | Merge branch 'maint'Shawn O. Pearce2010-02-081-0/+3
| | |\ \ \
| | | * | | git-gui: check whether systems nice command works or disable itHeiko Voigt2010-02-081-0/+3
* | | | | | Merge branch 'ab/tap' into maintJunio C Hamano2010-08-021-4/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | test-lib: Remove 3 year old no-op --no-python optionÆvar Arnfjörð Bjarmason2010-08-021-3/+0
| * | | | | test-lib: Ignore --quiet under a TAP harnessÆvar Arnfjörð Bjarmason2010-08-021-1/+3
* | | | | | Documentation/rev-parse: quoting is required with --parseoptThomas Rast2010-08-021-2/+5
* | | | | | Documentation: reporting bugsJunio C Hamano2010-08-021-0/+7
* | | | | | Fix git rebase --continue to work with touched filesDavid D. Kilzer2010-07-282-0/+44
* | | | | | Document ls-files -t as semi-obsolete.Matthieu Moy2010-07-281-2/+10
* | | | | | Git 1.7.2.1v1.7.2.1Junio C Hamano2010-07-274-3/+29
View Lorry Controller Status