tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Documentation: update to git-merge-base --octopus
[git.git]
/
notes-merge.c
2010-12-08
Junio C Hamano
Merge branch 'ks/maint-getenv-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-08
Junio C Hamano
Merge branch 'gb/gitweb-remote-heads'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-08
Junio C Hamano
Merge branch 'mg/maint-tag-rfc1991'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-08
Junio C Hamano
Merge branch 'jh/notes-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Add another auto-resolving strategy...
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: List conflicting notes in notes merge...
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, part 2/2
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, part 1/2
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Add automatic conflict resolvers ...
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Handle real, non-conflicting notes...
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
builtin/notes.c: Refactor creation of notes commits.
blob
|
commitdiff
|
raw
|
diff to current
2010-11-17
Johan Herland
git notes merge: Initial implementation handling trivia...
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
