| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree | Johan Herland | 2012-03-15 | 1 | -4/+4 |
| * | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland | 2012-03-15 | 1 | -1/+1 |
| * | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland | 2012-03-15 | 1 | -0/+19 |
| * | test: fix '&&' chaining | Ramkumar Ramachandra | 2011-12-08 | 1 | -5/+5 |
| * | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 2010-11-17 | 1 | -0/+76 |
| * | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -0/+12 |
| * | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -0/+176 |
| * | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -0/+292 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |