repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: document --3way option
2012-07-09
Ju
n
io C
H
am
a
no
apply: docu
m
ent
-
-3wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
H
a
mano
a
pply: al
l
ow rerere() t
o
work o
n
--3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Haman
o
apply: register confl
i
cte
d
s
t
ages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
--3
w
ay wi
t
h a
d
d
/
add c
o
n
flict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C
Ham
a
no
apply:
m
ove verify_
i
ndex_m
a
tch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Ham
a
n
o
apply
:
pl
u
g the three-w
a
y merge lo
g
ic
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
apply: fall
b
ack on th
r
ee-wa
y
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
m
a
no
apply:
a
ccept
-
3
/
--3way command line optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "al
r
eady exists" logic to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
ply: mo
v
e c
h
eck_to_create_blob() closer to
i
ts sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
ap
p
ly: furt
h
er split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
p
ply: refactor "p
r
ev
i
ous
patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
ap
p
l
y
:
s
plit lo
a
d
_p
r
ei
m
age
(
)
helper functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply:
f
actor ou
t
che
c
k
out_ta
r
ge
t
()
h
elper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
apply: ref
a
ctor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply: clear_image() c
l
ea
r
s things a
bit
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
ap
p
l
y
:
a
bit more comments
o
n PATH_T
O
_
BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
aman
o
a
p
ply:
f
i
x an in
c
o
m
pl
e
te comment in
ch
e
c
k
_
patch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
The ninth batch of to
p
i
c
s graduated t
o
'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Mer
g
e branch 'nh
/
empty-rebas
e
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Hamano
M
erge
b
ranch 'zj/diff-
e
mpty
-
c
h
mod'
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge branch 'jk/m
a
i
nt-tfo
r
mat-w
i
t
h
-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Mer
g
e branch 'th/difftool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Sync w
i
th main
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Start preparing
fo
r
1
.
7
.
1
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C Hamano
Mer
g
e b
r
a
nch 'jk/ma
i
n
t
-gi
t
web-test-use-san
e
-pe
r
l
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Mer
g
e branch 'js/daemon-test-race-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Merg
e
br
a
nc
h
'jk/maint
-
c
o
nfig-b
o
gus-section' into
m
aint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C
Hama
n
o
Merg
e
branch 'pw/
t
5800-
i
m
p
ort-race-fi
x
' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Merge
branch 'rt/cherry-revert-conflict-sum
m
a
r
y
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge
b
ranc
h
'
c
b
/
mai
n
t-report
-
mount-poi
n
t
-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyckoff
git p4 doc: fix f
o
rmatting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-04
Nguyễn Thái Ngọc D
u
y
Ma
k
efile: keep m
a
ny variable list sor
t
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Neil H
o
r
man
g
it cherry-pick: do not de
r
ef
e
re
n
ce a potential NULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Me
r
ge branch 'jc/merge-redu
c
e-parent
s
-ea
r
ly
'
into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Ha
m
ano
Merge branch
'cb/c
h
erry
-
pic
k
-rev
-
path-confusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge
b
r
a
nch
'cb/h
t
t
p-m
u
l
ti-c
u
rl
-
a
u
th' into maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge b
r
a
nch
'm
b
/fetch-call-a-non-branch-a-ref'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
e
rge b
r
anch
'rl/mai
n
t-stas
h
-i18n-save-err
o
r' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Haman
o
Merge branch
'jm/
m
a
int-strncpy-diff-no-index' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
i
o
C Hamano
Merge branch 'jk/mai
n
t
-pus
h
-pr
o
g
r
es
s
'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
amano
Merge branch 'nd/
c
olu
m
ns'
commit
|
commitdiff
|
tree
2012-05-03
J
ef
f
King
doc/
c
onfig: fix inline literals
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
The eigh
t
h batc
h
of topi
c
s gr
a
duated
to 'm
a
s
t
e
r
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'ma
s
ter' of git://git
.
bogomips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C H
a
mano
Merge branch '
t
r/xdiff-fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Hamano
M
e
rge branch 'jk/
m
a
i
n
t-gitweb-test-u
s
e-sane-perl
'
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C
H
amano
Merge branch 'pw/message
-
c
l
ea
n
u
p
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
M
e
r
g
e bran
c
h 'zj/d
i
ff-stat-smal
l
er-num-columns'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch 'pw/p
4
-v
a
rio
u
s'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge branch 'jc/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
J
un
i
o C Ham
a
n
o
Me
r
ge
b
ranch 'a
b
/i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch 'lp/diffstat-with-graph'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merge bra
n
ch 'zj/mksh-columns-bre
a
kage'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Mer
g
e branc
h
'
jk
/
doc-asciidoc-
i
nline-lit
e
ral'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
Merge branch 'nd/i18
n
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
amano
M
er
g
e branch 'mm
/
simple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
M
e
rge branc
h
'
jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Joh
a
nnes
S
ixt
t4006: Windows d
o
not have /dev/zero
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew Jędrzejewsk
.
.
.
di
f
f -
-
stat: do
not
run diff on indentica
l
f
i
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbign
i
ew Jędrzejews
k
.
.
.
d
i
ff --st
a
t
:
report mode-on
l
y cha
n
ges f
o
r
b
inary files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
m
a
no
Mer
g
e branc
h
'maste
r
'
o
f htt
p
s://gith
u
b
.
c
o
m/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Sync with v1
.
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
J
uni
o
C H
a
mano
Merge bran
c
h
'pw/
f
ast
-
impor
t
-dataref-parsing' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio C
Ha
m
ano
Merge branch 'it/fetch-
p
ack-many-refs' into
m
aint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jl/maint-submodule-r
e
curse-f
e
t
ch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ha
m
a
n
o
Merg
e
branch 'jc/maint-
b
l
a
m
e-minimal
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
M
erge branch 'lp
/
maint-diff-three-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
Hamano
M
erge branch
'
jk
/
rebas
e
-i-submodule-confli
c
t
-
o
nly
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C Hamano
Mer
g
e branch 'maint' of h
t
tp
s
://
g
i
t
hu
b
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigni
e
w Jędrzejewsk
.
.
.
Co
n
sistently u
s
e
p
e
rl
f
r
om /usr/bin/ for scri
p
ts
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Tho
m
as Ra
s
t
xd
i
f
f
:
choose XDL_FAST_HA
S
H code on
si
z
eof(lo
n
g) instea
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f Kin
g
t
/
gitweb-lib
:
us
e
$
PERL_PATH to r
u
n gi
t
w
e
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrze
j
ewsk
.
.
.
te
s
ts:
c
heck --[short]stat ou
t
put after chmo
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew
J
ędrzejewsk
.
.
.
te
s
t: moderniz
e
style of t4006
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Junio C Hamano
l
og-tree: the previou
s
one
i
s still not qui
t
e right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jan
Krüger
log-tree: use
c
u
sto
m
line
termi
n
ator in line termination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff Ki
n
g
t5541: test
mo
r
e
c
ombinations of
--pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f King
teach send-pa
c
k
about --
[
no-]progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
eff
Ki
n
g
s
end-pa
c
k: show progre
s
s when isatty(2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: sub
m
it fil
e
s
wi
t
h wild
c
ards
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pet
e
Wyckoff
git p4:
fix w
r
it
a
ble file a
f
t
e
r rename or copy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
g
i
t p4: test submi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyc
k
off
git p4
:
brin
g
b
a
ck fi
l
es
i
n
d
eleted client directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wy
c
kof
f
remove b
l
ank f
i
len
a
me in error
mes
s
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yckoff
remove superfluous newlines
i
n error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio
C Ham
a
no
Merge b
r
anch '
l
d/
g
it-
p
4-tag
s
-and-
l
a
bels'
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Hama
n
o
Merge branch 'nh
/
empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge
branch 'jk
/
m
a
int-conf
i
g-
b
o
gus-se
c
t
i
o
n'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Jędr
z
ejewsk
.
.
.
diff --sta
t
:
use less columns f
o
r c
h
ange c
o
unts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
n
i
o
C Hamano
contrib/rere
r
e-train: use
in
s
talled git-sh-set
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Ar
n
f
jörð Bjarmas
o
n
g
i
t-
c
o
m
mit: remove le
g
o
i
n i1
8
n messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmason
g
it-comm
i
t: remove lego in i18n messa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar A
r
nfjörð Bjarmason
git-bran
c
h
: remove lego in i18n
m
es
s
ag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
The seventh
ba
t
ch of topics grad
u
a
t
ed
t
o 'm
a
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
n
io C Hamano
Merge
bra
n
ch
'js/daemon-test-
r
ace-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
b
ranch 'kk/gitweb-
o
mit-expensive'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge branch 'kk/maint-
g
itweb-miss
i
ng-ow
n
er'
commit
|
commitdiff
|
tree
next