aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\
| * Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-17
| * cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-17
| * Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-17
| * git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland2010-11-17
| * git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
| * git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-17
| * git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
| * git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
| * git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
| * Documentation: Preliminary docs on 'git notes merge'Johan Herland2010-11-17
| * git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
| * git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
| * builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-17
| * git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17
| * builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-17
| * notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-17
| * (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland2010-11-17
| * notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-17
| * notes.h/c: Allow combine_notes functions to remove notesJohan Herland2010-11-10
| * notes.c: Reorder functions in preparation for next commitJohan Herland2010-11-10
| * notes.h: Make default_notes_ref() available in notes APIJohan Herland2010-11-10
| * (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland2010-11-10
| * notes.c: Hexify SHA1 in die() message from init_notes()Johan Herland2010-11-10
* | Merge branch 'jk/diff-CBM'Junio C Hamano2010-12-08
|\ \
| * | diff: report bogus input to -C/-M/-BJeff King2010-10-21
* | | Merge branch 'maint'Junio C Hamano2010-12-07
|\ \ \
| * | | git-rm.txt: Fix quotingMichael J Gruber2010-12-07
* | | | Makefile: dependencies for vcs-svn testsJonathan Nieder2010-12-07
* | | | parse-remote: handle detached HEADSanti Béjar2010-12-06
* | | | Merge branch 'jn/ignore-doc'Junio C Hamano2010-12-03
|\ \ \ \
| * | | | Documentation: point to related commands from gitignoreJonathan Nieder2010-11-11
| * | | | Documentation: split gitignore page into sectionsJonathan Nieder2010-11-11
* | | | | Merge branch 'kb/maint-status-cquote'Junio C Hamano2010-12-03
|\ \ \ \ \
| * | | | | status: Quote paths with spaces in short formatKevin Ballard2010-11-09
* | | | | | Merge branch 'jn/thinner-wrapper'Junio C Hamano2010-12-03
|\ \ \ \ \ \
| * | | | | | Remove pack file handling dependency from wrapper.oJonathan Nieder2010-11-10
| * | | | | | pack-objects: mark file-local variable staticJonathan Nieder2010-11-10
| * | | | | | wrapper: give zlib wrappers their own translation unitJonathan Nieder2010-11-10
| * | | | | | strbuf: move strbuf_branchname to sha1_name.cJonathan Nieder2010-11-10
| * | | | | | path helpers: move git_mkstemp* to wrapper.cJonathan Nieder2010-11-10
| * | | | | | wrapper: move odb_* to environment.cJonathan Nieder2010-11-10
| * | | | | | wrapper: move xmmap() to sha1_file.cJonathan Nieder2010-11-10
* | | | | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-03
|\ \ \ \ \ \ \
| * | | | | | | add tests of commit --squashPat Notz2010-11-04
| * | | | | | | commit: --squash option for use with rebase --autosquashPat Notz2010-11-04
| * | | | | | | add tests of commit --fixupPat Notz2010-11-04
| * | | | | | | commit: --fixup option for use with rebase --autosquashPat Notz2010-11-04
| * | | | | | | pretty.c: teach format_commit_message() to reencode the outputPat Notz2010-11-04
| * | | | | | | commit: helper methods to reduce redundant blocks of codePat Notz2010-11-04
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-15 07:42:15 +0000