🌐 AI搜索 & 代理
🔍
主页
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v1.6.6.3
/
ll-merge.c
tag
59a540fa3ce7e4483cbd9f3d7c552b009fc19c47
tagger
Junio C Hamano <gitster@pobox.com>
Wed Dec 15 19:33:35 2010
object
abf411e28d9df669b0e690578a1eb95c0bd29847
Git 1.6.6.3
08ac696
Merge branch 'js/run-command-updates'
by Junio C Hamano
· 16 years ago
dd787c1
Merge branch 'tr/die_errno'
by Junio C Hamano
· 16 years ago
5709e03
run_command: return exit code as positive value
by Johannes Sixt
· 16 years ago
606475f
Remove filename from conflict markers
by Martin Renold
· 16 years ago
0721c31
Use die_errno() instead of die() when checking syscalls
by Thomas Rast
· 16 years ago
09236d8
Merge branch 'sb/maint-1.6.0-add-config-fix'
by Junio C Hamano
· 16 years ago
90dce51
use xstrdup, not strdup in ll-merge.c
by Jim Meyering
· 17 years ago
0077138
Simplify some instances of run_command() by using run_command_v_opt().
by Johannes Sixt
· 17 years ago
691f1a2
replace direct calls to unlink(2) with unlink_or_warn
by Alex Riesen
· 17 years ago
ced621b
merge-recursive: use strbuf_expand() instead of interpolate()
by René Scharfe
· 17 years ago
c236bcd
git-merge-recursive: learn to honor merge.conflictstyle
by Junio C Hamano
· 17 years ago
ef90d6d
Provide git_config with a callback-data parameter
by Johannes Schindelin
· 18 years ago
525ab63
merge-recursive: split low-level merge functions out.
by Junio C Hamano
· 18 years ago