repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: plug the three-way merge logic in
2012-07-09
Junio C Hamano
apply: plug the thre
e
-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hama
n
o
apply: fall back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: ac
c
e
pt
-
3/
-
-3way command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
pply:
m
ove "already ex
i
sts" logic t
o
check
_
to_cre
a
te
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
apply:
m
ove check_to_create_blob() closer t
o
its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
further spl
i
t
l
o
ad_p
r
eimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
aman
o
app
l
y
:
r
e
factor "
p
revious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Ha
m
ano
apply:
s
plit loa
d
_
p
r
e
im
a
ge() helper f
u
ncti
o
n
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
factor
out chec
k
ou
t
_target(
)
helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
app
l
y: r
e
factor read_fi
l
e_or_g
i
t
link()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
pply: clear_image() clear
s
things a bi
t
mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
ap
p
l
y: a bit more comme
n
t
s
on PATH_TO_BE_DELE
T
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
n
o
appl
y
: fix an incomplete comment in c
h
eck_pa
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
am
a
no
The n
i
nth batch of topics
gra
d
uated to
'
master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Mer
g
e branch
'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C
H
amano
Merge
br
a
nch
'zj/
d
iff-empt
y
-c
h
mo
d
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Merge branch '
j
k
/
m
a
int-tforma
t
-with-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Merge branch 'th/dif
f
tool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
H
a
m
a
no
St
a
rt
preparing for 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C H
a
mano
Merge branch 'jk/maint-gitw
e
b-tes
t
-use-san
e
-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hamano
Mer
g
e br
a
nch 'js/
d
a
e
mon-te
s
t
-race-fix' into
maint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C
H
amano
Merge branch 'jk
/
maint-co
n
f
ig-bo
g
u
s
-section'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Ham
a
n
o
Me
r
ge bran
c
h 'pw/t5800-import-race-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
io C
Hamano
Me
r
ge br
a
nch 'rt/
c
herry
-
revert-c
o
nflict
-
summary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
H
am
a
no
Merge
b
ra
n
ch 'cb/main
t
-
r
eport-mount-poi
n
t-co
r
rectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
P
ete Wyck
o
ff
git p4 doc: fix fo
r
matting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-04
Nguy
ễ
n
T
h
á
i
Ngọc Duy
Makefile
:
keep many
v
aria
b
le l
i
s
t sorte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Ne
i
l Horman
git cherry-
p
ick: do
n
o
t de
r
e
f
erence a
potential NULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C H
a
mano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'jc/m
e
r
g
e
-
reduce-parent
s
-early' into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ha
m
an
o
Merge branch
'cb/cherry-pick
-
rev-path-confusio
n
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ham
a
no
Merge branch 'cb/http-multi-curl
-
auth'
into maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Merge
b
ranch
'
mb/
f
etch-call
-
a-non-branch-a-
r
ef' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge bra
n
c
h 'rl/maint-stash-i18n-sa
v
e
-
er
r
o
r
' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Hamano
Merge
bra
n
c
h
'j
m
/mai
n
t-strncpy-dif
f
-no-index' i
n
t
o
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Merge branch 'jk/maint-push-progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Haman
o
Merg
e
branch 'nd/
c
o
lumns'
commit
|
commitdiff
|
tree
2012-05-03
J
eff King
doc/
c
o
n
fig: fix in
l
ine
literal
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
T
h
e eighth batch of topics g
r
aduated to '
m
ast
e
r
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merg
e
branch 'master' of g
i
t:
/
/g
i
t
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'tr/xdiff-fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
am
a
no
Merge branch 'jk/maint-gi
t
web-test-use-
s
an
e
-perl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
b
ra
n
ch 'pw/message-cleanup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
b
r
anch 'zj/di
f
f-stat
-
small
e
r-num-colum
n
s
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge bra
n
ch '
p
w/p4-various
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
mano
Merge
b
ranch
'
jc
/
re
r
ere-t
r
ain'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o
C Hamano
Merge branch 'ab/i18
n
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'lp/diffstat-
w
ith-graph'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
M
e
rg
e
branch 'zj/mksh-
c
olumns
-
br
e
akage'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C
H
aman
o
Me
r
g
e branch 'jk/doc-
a
sciid
o
c-inlin
e
-literal'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge
branch
'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge bra
n
ch 'mm/
s
imple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch 'jc/i
n
d
ex-
v
4'
commit
|
commitdiff
|
tree
2012-05-02
Johanne
s
S
ix
t
t40
0
6: W
i
ndow
s
d
o
n
ot ha
v
e /d
e
v
/zero
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew
Jęd
r
zejewsk
.
.
.
diff --s
t
a
t
:
do not run diff on
indentical fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew Jędrze
j
ewsk
.
.
.
diff --st
a
t:
report mode-only changes for
b
i
n
ary f
i
les
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branch 'maste
r
' of h
t
tps://git
h
u
b
.
co
m
/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ha
m
ano
Sync with v
1
.
7
.
1
0
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Git 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge bran
c
h 'p
w
/fast
-
import-dataref-parsin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Me
r
ge branch 'it/fetch-pack-many-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Merge branch
'
jl/maint-submodule-recurse-fe
t
ch'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Me
r
ge
bra
n
ch 'jc/maint-blame-minimal' int
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rg
e
branch 'lp/maint-diff-th
r
ee-da
s
h-w
i
t
h-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Mer
g
e b
r
a
n
ch 'jk/reba
s
e-i-submodul
e
-con
f
lict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
M
erge branc
h
'maint'
of https://github
.
com/g
i
t-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbignie
w
Jędrzej
e
wsk
.
.
.
C
o
n
s
istently use perl from /usr
/
bi
n
/ for scripts
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Thom
a
s Rast
xdiff: choose XDL_FAST
_
HASH code
o
n
s
i
zeof(long) ins
t
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t
/gitweb-
l
ib: u
s
e $PER
L
_PATH to
r
un git
w
eb
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Ję
d
rzejew
s
k
.
.
.
tests: check --[short]stat o
u
tp
u
t a
f
ter
chmod
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jęd
r
zeje
w
s
k
.
.
.
te
s
t: mode
r
nize style of t4006
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Junio C Ham
a
no
log-tree: the pr
e
vious one is sti
l
l not
quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jan Krü
g
er
l
og-tree:
u
s
e
cust
o
m
l
ine terminator
i
n
line te
r
m
ination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff Kin
g
t5541:
t
est more combinations
of --progres
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
eff Kin
g
teach send-
p
ack about
-
-[no-]progr
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f King
send-pack: show
p
r
ogress when isa
t
ty(2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyc
k
off
git p4: submit files wit
h
wildcard
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pe
t
e Wy
c
koff
g
i
t p4: fix wr
i
table file aft
e
r rena
m
e or copy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4:
t
est subm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4:
b
ring back fi
l
es in dele
t
ed client directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yc
k
off
remove bla
n
k
fi
l
en
a
me in
error
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
P
ete Wyc
k
off
remove
s
uper
f
l
uous newline
s
in
e
rror messag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C
H
amano
Merg
e
b
ran
c
h
'ld/gi
t
-p4-t
a
gs-
a
n
d-labels'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Mer
g
e bra
n
c
h
'nh/
e
mpty-reba
s
e
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
bra
n
ch 'jk/maint-config-bogus-
s
ection'
commit
|
commitdiff
|
tree
2012-04-30
Zbig
n
iew Jęd
r
z
e
jew
s
k
.
.
.
diff --stat:
use less
c
o
l
umns fo
r
change
c
ounts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
c
o
ntrib/rere
r
e-train: use installed git
-
s
h-set
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æva
r
Arnfjörð Bjarmaso
n
git-
c
ommit:
remove lego in i18n
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmas
o
n
git-commit: remove lego in i18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æva
r
Arnfjörð Bjarmason
git
-
branc
h
:
re
m
ove leg
o
in
i
18n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hamano
The
seventh batch of topi
c
s
g
raduated to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C H
a
m
a
n
o
Merge branch 'js/daemon-test-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
H
a
m
a
no
Mer
g
e bran
c
h
'
kk/gi
t
web
-
om
i
t-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge br
a
nc
h
'kk
/
maint-
g
itw
e
b-missin
g
-
o
wner'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
M
e
rge
b
ra
n
ch 'rs/commit-list-a
p
pend'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge branch 'mm/
i
n
clude-user
p
ath'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hama
n
o
Merge br
a
n
c
h 'pw
/
t5800-imp
o
rt-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
H
amano
Merge b
r
anch 'jk/r
e
pack-no-explode-objects-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
Jeff King
c
onfig: e
x
pand
t
i
ldes in include
.
p
a
th va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next