kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
1773 Commits
6 Branches
36 Tags
131 MiB
Tree: 98533b90cb
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '98533b90cb'
${ noResults }
Commit Graph

6 Commits (98533b90cb8e88484cb381334b19cbf4f7cf92b1)

Author SHA1 Message Date
Junio C Hamano 74376a6864 git-merge-recursive: Trivial RE fixes.
19 years ago
Fredrik Kuivinen 6511cce24b [PATCH] Use a temporary index file when we merge the common ancestors.
19 years ago
Fredrik Kuivinen 87a71b65ac [PATCH] Adjust git-merge-recursive.py for the new tool names.
19 years ago
Fredrik Kuivinen 0d214b6619 [PATCH] Don't output 'Automatic merge failed, ...'
19 years ago
Fredrik Kuivinen d9a23fa6f7 [PATCH] Be more like the 'resolve' strategy.
19 years ago
Fredrik Kuivinen e4cf17ce0d [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
19 years ago
Fredrik Kuivinen 206e587cb8 [PATCH] Make sure we die if we don't get enough arguments.
19 years ago
Fredrik Kuivinen 654291a2ac [PATCH] Introduce a 'die' function.
19 years ago
Fredrik Kuivinen ace36858d3 [PATCH] Exit with status code 2 if we get an exception.
19 years ago
Fredrik Kuivinen 8ceba720ba [PATCH] Fix assertion failure when merging common ancestors.
19 years ago
Junio C Hamano 720d150c48 Add a new merge strategy by Fredrik Kuivinen.
19 years ago