๐ AIๆ็ดข & ไปฃ็
๐
ไธป้กต
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v1.6.6.3
/
merge-index.c
tag
59a540fa3ce7e4483cbd9f3d7c552b009fc19c47
tagger
Junio C Hamano <gitster@pobox.com>
Wed Dec 15 19:33:35 2010
object
abf411e28d9df669b0e690578a1eb95c0bd29847
Git 1.6.6.3
0077138
Simplify some instances of run_command() by using run_command_v_opt().
by Johannes Sixt
ยท 17 years ago
34263de
Replace deprecated dashed git commands in usage
by Alexander Potashev
ยท 17 years ago
2fb3f6d
Add calls to git_extract_argv0_path() in programs that call git_config_*
by Steffen Prohaska
ยท 17 years ago
7e44c93
'git foo' program identifies itself without dash in die() messages
by Junio C Hamano
ยท 17 years ago
c7fae5f
git-merge-index documentation: clarify synopsis
by Gerrit Pape
ยท 18 years ago
7a51ed6
Make on-disk index representation separate from in-core one
by Linus Torvalds
ยท 18 years ago
a6080a0
War on whitespace
by Junio C Hamano
ยท 19 years ago
843d49a
Fix merge-index
by Junio C Hamano
ยท 19 years ago
b49809c
Use run_command within merge-index
by Shawn O. Pearce
ยท 19 years ago
308efc1
merge-index: fix longstanding bug in merging symlinks
by Junio C Hamano
ยท 19 years ago
8502357
simplify inclusion of system header files.
by Junio C Hamano
ยท 19 years ago
96f1e58
remove unnecessary initializations
by David Rientjes
ยท 19 years ago
6f002f9
use appropriate typedefs
by David Rientjes
ยท 19 years ago
e898081
Solaris needs inclusion of signal.h for signal()
by Dennis Stosberg
ยท 19 years ago
f0b7367
Restore SIGCHLD to SIG_DFL where we care about waitpid().
by Junio C Hamano
ยท 19 years ago
53228a5
Make the rest of commands work from a subdirectory.
by Junio C Hamano
ยท 20 years ago
215a7ad
Big tool rename.
by Junio C Hamano
ยท 20 years ago
[Renamed (91%) from merge-cache.c]
b32e986
[PATCH] Fix git-merge-cache -q
by Petr Baudis
ยท 20 years ago
bbd14cb
[PATCH] git-merge-cache -q doesn't complain about failing merge program
by Petr Baudis
ยท 20 years ago
667bb59
[PATCH] cleanup of in-code names
by Alexey Nezhdanov
ยท 21 years ago
2a45925
git-merge-cache -o does all the automerges in a single shot
by Petr Baudis
ยท 21 years ago
8c59926
Make merge-cache not fail immediatelly when the merge program
by Petr Baudis
ยท 21 years ago
e2b6a9d
[PATCH] make file merging respect permissions
by James Bottomley
ยท 21 years ago
e3b4be7
Change merge-cache and git-merge-one-file to use the SHA1 of the file
by Linus Torvalds
ยท 21 years ago
75118b1
Ass a "merge-cache" helper program to execute a merge on any unmerged files.
by Linus Torvalds
ยท 21 years ago