summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ld/push-porcelain'Junio C Hamano2010-03-155-9/+67
|\
| * t5516: Use test_cmp when appropriateJunio C Hamano2010-03-111-3/+3
| * git-push: add tests for git push --porcelainLarry D'Anna2010-02-281-0/+50
| * git-push: make git push --porcelain print "Done"Larry D'Anna2010-02-283-5/+13
| * git-push: send "To <remoteurl>" messages to the standard output in --porcelai...Larry D'Anna2010-02-281-1/+1
| * git-push: fix an advice message so it goes to stderrLarry D'Anna2010-02-281-3/+3
* | Merge branch 'jh/notes'Junio C Hamano2010-03-1514-196/+2167
|\ \
| * | Documentation: fix a few typos in git-notes.txtMichael J Gruber2010-03-041-2/+2
| * | notes: fix malformed tree entryJunio C Hamano2010-02-241-2/+2
| * | builtin-notes: Minor (mostly parse_options-related) fixesJohan Herland2010-02-241-21/+17
| * | builtin-notes: Add "copy" subcommand for copying notes between objectsJohan Herland2010-02-133-8/+102
| * | builtin-notes: Misc. refactoring of argc and exit value handlingJohan Herland2010-02-131-25/+36
| * | builtin-notes: Add -c/-C options for reusing notesJohan Herland2010-02-133-12/+179
| * | builtin-notes: Refactor handling of -F option to allow combining -m and -FJohan Herland2010-02-132-44/+73
| * | builtin-notes: Deprecate the -m/-F options for "git notes edit"Johan Herland2010-02-135-8/+14
| * | builtin-notes: Add "append" subcommand for appending to note objectsJohan Herland2010-02-133-9/+67
| * | builtin-notes: Add "add" subcommand for adding notes to objectsJohan Herland2010-02-133-22/+74
| * | builtin-notes: Add --message/--file aliases for -m/-F optionsJohan Herland2010-02-132-2/+4
| * | builtin-notes: Add "list" subcommand for listing note objectsJohan Herland2010-02-133-6/+76
| * | Documentation: Generalize git-notes docs to 'objects' instead of 'commits'Johan Herland2010-02-131-15/+20
| * | builtin-notes: Add "prune" subcommand for removing notes for missing objectsJohan Herland2010-02-133-11/+115
| * | Notes API: prune_notes(): Prune notes that belong to non-existing objectsJohan Herland2010-02-132-0/+51
| * | t3305: Verify that removing notes triggers automatic fanout consolidationJohan Herland2010-02-131-1/+46
| * | builtin-notes: Add "remove" subcommand for removing existing notesJohan Herland2010-02-133-34/+73
| * | Teach builtin-notes to remove empty notesJohan Herland2010-02-132-4/+42
| * | Teach notes code to properly preserve non-notes in the notes treeJohan Herland2010-02-134-51/+233
| * | t3305: Verify that adding many notes with git-notes triggers increased fanoutJohan Herland2010-02-131-0/+50
| * | t3301: Verify successful annotation of non-commitsJohan Herland2010-02-131-0/+17
| * | Builtin-ify git-notesJohan Herland2010-02-137-40/+350
| * | Refactor notes concatenation into a flexible interface for combining notesJohan Herland2010-02-132-60/+112
| * | Notes API: Allow multiple concurrent notes trees with new struct notes_treeJohan Herland2010-02-133-66/+112
| * | Notes API: write_notes_tree(): Store the notes tree in the databaseJohan Herland2010-02-132-3/+180
| * | Notes API: for_each_note(): Traverse the entire notes tree with a callbackJohan Herland2010-02-132-0/+180
| * | Notes API: get_note(): Return the note annotating the given objectJohan Herland2010-02-132-7/+15
| * | Notes API: remove_note(): Remove note objects from the notes tree structureJohan Herland2010-02-132-1/+87
| * | Notes API: add_note(): Add note objects to the internal notes tree structureJohan Herland2010-02-132-0/+15
| * | Notes API: init_notes(): Initialize the notes tree from the given notes refJohan Herland2010-02-132-12/+38
| * | Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRefJohan Herland2010-02-131-0/+48
| * | Notes API: get_commit_notes() -> format_note() + remove the commit restrictionJohan Herland2010-02-133-22/+30
| * | Minor cosmetic fixes to notes.cJohan Herland2010-02-131-5/+4
* | | Merge branch 'maint'Junio C Hamano2010-03-136-14/+47
|\ \ \
| * | | don't use default revision if a rev was specifiedDave Olszewski2010-03-132-2/+13
| * | | for_each_recent_reflog_ent(): use strbuf, fix offset handlingRené Scharfe2010-03-131-10/+12
| * | | t/Makefile: remove test artifacts upon "make clean"Junio C Hamano2010-03-131-0/+2
| * | | blame: fix indent of line numbersRené Scharfe2010-03-132-2/+20
* | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-03-133-2/+4
|\ \ \ \
| * | | | t9150,t9151: Add rewrite-root option to initTuomas Suutari2010-03-132-0/+2
| * | | | git-svn: Fix merge detecting with rewrite-rootTuomas Suutari2010-03-131-2/+2
* | | | | Merge branch 'maint'Junio C Hamano2010-03-121-12/+12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | t9400: Use test_cmp when appropriateJunio C Hamano2010-03-111-12/+12
View Lorry Controller Status