| 2011-02-16 | push.default: Rename 'tracking' to 'upstream' Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | Provide 'git merge --abort' as a synonym to 'git reset... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | cmd_merge(): Parse options before checking MERGE_HEAD Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | Provide 'git notes get-ref' to easily retrieve current... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Add testcases for merging notes trees... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Add another auto-resolving strategy... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: --commit should fail if underlying... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: List conflicting notes in notes merge... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | Documentation: Preliminary docs on 'git notes merge' Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Add automatic conflict resolvers ... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Handle real, non-conflicting notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | builtin/notes.c: Refactor creation of notes commits. Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | git notes merge: Initial implementation handling trivial... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | builtin/notes.c: Split notes ref DWIMmery into a separate... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | notes.c: Use two newlines (instead of one) when concatenatin... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | (trivial) t3303: Indent with tabs instead of spaces... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-17 | notes.h/c: Propagate combine_notes_fn return value... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-10 | notes.h/c: Allow combine_notes functions to remove... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-10 | notes.c: Reorder functions in preparation for next... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-10 | notes.h: Make default_notes_ref() available in notes API Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-10 | (trivial) notes.h: Minor documentation fixes to copy_notes() Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-11-10 | notes.c: Hexify SHA1 in die() message from init_notes() Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-08-31 | notes: Don't create (empty) commit when removing non... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-07-13 | Enable custom schemes for column colors in the graph API Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-07-13 | Make graph_next_line() available in the graph.h API Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-06-06 | revision: Turn off history simplification in --ancestry... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-06-06 | revision: Fix typo in --ancestry-path error message Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-06-06 | Documentation/rev-list-options.txt: Explain --ancestry... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-06-06 | Documentation/rev-list-options.txt: Fix missing line... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-06-01 | diff.c: Ensure "index $from..$to" line contains unambiguous... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-25 | builtin-notes: Minor (mostly parse_options-related... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-17 | submodule summary: Don't barf when invoked in an empty... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "copy" subcommand for copying notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Misc. refactoring of argc and exit value... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add -c/-C options for reusing notes Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Refactor handling of -F option to allow... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Deprecate the -m/-F options for "git... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "append" subcommand for appending... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "add" subcommand for adding notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add --message/--file aliases for -m... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "list" subcommand for listing note... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Documentation: Generalize git-notes docs to 'objects... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "prune" subcommand for removing... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: prune_notes(): Prune notes that belong to... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | t3305: Verify that removing notes triggers automatic... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | builtin-notes: Add "remove" subcommand for removing... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Teach builtin-notes to remove empty notes Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Teach notes code to properly preserve non-notes in... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | t3305: Verify that adding many notes with git-notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | t3301: Verify successful annotation of non-commits Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Builtin-ify git-notes Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Refactor notes concatenation into a flexible interface... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: Allow multiple concurrent notes trees with... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: write_notes_tree(): Store the notes tree... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: for_each_note(): Traverse the entire notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: get_note(): Return the note annotating the... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: remove_note(): Remove note objects from... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: add_note(): Add note objects to the internal... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: init_notes(): Initialize the notes tree... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Add tests for checking correct handling of $GIT_NOTES_REF... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Notes API: get_commit_notes() -> format_note() + remove... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-02-14 | Minor cosmetic fixes to notes.c Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2010-01-26 | builtin-config: Fix crash when using "-f <relative... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-12-07 | Add more testcases to test fast-import of notes Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-12-07 | Rename t9301 to t9350, to make room for more fast-import... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-12-07 | fast-import: Proper notes tree manipulation Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-12-03 | Fix crasher on encountering SHA1-like non-note in notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-11-18 | Basic build infrastructure for Python scripts Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Add selftests verifying concatenation of multiple notes... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Refactor notes code to concatenate multiple notes annotating... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Add selftests verifying that we can parse notes trees... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Teach the notes lookup code to parse notes trees with... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Teach notes code to free its internal data structures... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Add flags to get_commit_notes() to control the format... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | t3302-notes-index-expensive: Speed up create_repo() Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | fast-import: Add support for importing commit notes Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-10-20 | Teach "-m <msg>" and "-F <file>" to "git notes edit" Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-20 | git clone: Add --recursive to automatically checkout... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-20 | t7407: Use 'rev-parse --short' rather than bash's substring... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | git submodule status: Add --recursive to recurse into... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | git submodule update: Introduce --recursive to update... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | git submodule foreach: Add --recursive to recurse into... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | git submodule foreach: test access to submodule name... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | Add selftest for 'git submodule foreach' Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-19 | git submodule: Cleanup usage string and add option... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-18 | git submodule foreach: Provide access to submodule... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-08-12 | help.c: give correct structure's size to memset() Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-07-11 | quickfetch(): Prevent overflow of the rev-list command... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-06-03 | git-submodule: add support for --merge. Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-06-03 | Rename submodule.<name>.rebase to submodule.<name>... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-04-18 | Update docs on behaviour of 'core.sharedRepository... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2009-03-28 | Move chmod(foo, 0444) into move_temp_to_file() Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-09-29 | Use strchrnul() instead of strchr() plus manual workaround Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-09-25 | Fix submodule sync with relative submodule URLs Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-09-25 | for-each-ref: Fix --format=%(subject) for log message... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-09-04 | Fix AsciiDoc errors in merge documentation Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-09-02 | Bring local clone's origin URL in line with that of... Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |
| 2008-08-21 | Teach "git diff -p" HTML funcname patterns Signed-off-by: Johan Herland <johan@herland.net> |
diff | tree |