Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2010-11-18Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland
2010-11-18cmd_merge(): Parse options before checking MERGE_HEADJohan Herland
2010-11-18Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland
2010-11-18git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland
2010-11-18git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-18git notes merge: --commit should fail if underlying notes ref has movedJohan Herland
2010-11-18git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-18git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-18git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-18Documentation: Preliminary docs on 'git notes merge'Johan Herland
2010-11-18git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-18git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-18builtin/notes.c: Refactor creation of notes commits.Johan Herland
2010-11-18git notes merge: Initial implementation handling trivial merges onlyJohan Herland
2010-11-18builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland
2010-11-18notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland
2010-11-18(trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland
2010-11-18notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland
2010-11-10notes.h/c: Allow combine_notes functions to remove notesJohan Herland
2010-11-10notes.c: Reorder functions in preparation for next commitJohan Herland
2010-11-10notes.h: Make default_notes_ref() available in notes APIJohan Herland
2010-11-10(trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland
2010-11-10notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland
2010-08-09notes: allow --dry-run for -n and --verbose for -vRené Scharfe
2010-08-09Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy
2010-08-09Documentation: cite git-am from git-applyBrad King
2010-08-09t7003: fix subdirectory-filter testThomas Rast
2010-08-06Allow "check-ref-format --branch" from subdirectoryJonathan Nieder
2010-08-06check-ref-format: handle subcommands in separate functionsJonathan Nieder
2010-08-05pretty-options.txt: match --format's documentation with implementation.Matthieu Moy
2010-08-04Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano
2010-08-04Merge branch 'rr/svn-fe' into maintJunio C Hamano
2010-08-04Merge branch 'pt/git-gui' into maintJunio C Hamano
2010-08-03contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra
2010-08-03contrib/svn-fe: Fix IncludePathRamkumar Ramachandra
2010-08-02Merge branch 'ab/tap' into maintJunio C Hamano
2010-08-02test-lib: Remove 3 year old no-op --no-python optionÆvar Arnfjörð Bjarmason
2010-08-02test-lib: Ignore --quiet under a TAP harnessÆvar Arnfjörð Bjarmason
2010-08-02Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano
2010-08-02Documentation/rev-parse: quoting is required with --parseoptThomas Rast
2010-08-02Documentation: reporting bugsJunio C Hamano
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano
2010-08-02git-gui: fix size and position of window panes on startupPat Thoyts
2010-08-02git-gui: mc cannot be used before msgcat has been loadedPat Thoyts
2010-07-30git-gui: use textconv filter for diff and blameClément Poulain
2010-07-30git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32Pat Thoyts
2010-07-30git-gui: fix shortcut creation on cygwinHeiko Voigt
2010-07-30git-gui: fix PATH environment for mingw development environmentHeiko Voigt
2010-07-30git-gui: fix usage of _gitworktree when creating shortcut for windowsHeiko Voigt
2010-07-30git-gui: fix "Explore Working Copy" for Windows againMarkus Heidelberg