author | Felipe Contreras <felipe.contreras@gmail.com> | |
Sat, 10 May 2014 02:45:07 +0000 (21:45 -0500) | ||
committer | Felipe Contreras <felipe.contreras@gmail.com> | |
Wed, 18 May 2016 20:08:18 +0000 (15:08 -0500) | ||
commit | 5643c6be1d42f0ec0d44572d38714a8ef9952b6c | |
tree | 70558325afa413cc0d43f2859ab6b6f7f4cff374 | tree | snapshot |
parent | e9de06b4de8bc76b3ad57f64aefcedbf5dd2b28d | commit | diff |
Documentation/merge-options.txt | diff | blob | blame | history | |
builtin/commit.c | diff | blob | blame | history | |
builtin/merge.c | diff | blob | blame | history | |
commit.c | diff | blob | blame | history | |
commit.h | diff | blob | blame | history | |
t/t7600-merge.sh | diff | blob | blame | history |