repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
apply: --3way with add/add conflict
2012-07-09
Junio C
H
amano
apply: --3way
w
it
h
ad
d
/
a
d
d
c
onfli
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Ha
m
a
n
o
apply:
m
ove
v
erify_
i
nd
e
x_match
(
) higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
apply: plug the th
r
e
e-wa
y
m
e
rge logic
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
a
pply: fal
l
back on
t
hree-way merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
appl
y
: accept
-3
/
--3
w
ay co
m
mand line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: move "alre
a
dy exi
s
ts" logi
c
to chec
k
_
to_cre
a
te()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
apply: move check_to_create_blob() closer to its
s
ol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: further split
load_preimag
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: refactor "
p
revi
o
us p
a
tch" logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
apply: split load_preimage() helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out checkout_targe
t
() helpe
r
fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: refactor read
_
file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
c
l
ear_i
m
a
g
e() clears
t
h
i
n
g
s
a bit mor
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
a
bit more
c
o
mments on PATH_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
app
l
y: fix
an incomplete c
o
mm
e
nt
i
n chec
k
_
p
atch(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hamano
The
nin
t
h ba
t
ch of top
i
cs gradua
t
ed to 'mast
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
erge
b
ranch 'nh/emp
t
y
-
r
ebase'
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hamano
M
e
r
ge branch 'z
j
/di
f
f-
e
mpty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
M
erge bra
n
ch 'j
k
/maint-tformat-with-z
'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge b
r
anch 'th/d
i
f
f
tool-diffal
l
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Sync
w
ith maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
H
amano
Start pr
e
pa
r
i
ng for 1
.
7
.
1
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
unio
C Hamano
Me
r
ge bra
n
c
h
'jk/maint
-
gitweb-tes
t
-use-sane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io
C
Hama
n
o
Merge b
r
an
c
h '
j
s/daemon-te
s
t-race-fix' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hama
n
o
Merge branch 'jk/maint-config-bogus-section
'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C H
a
mano
Merge branch
'p
w
/t5800-import-race-fix'
into main
t
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Ha
m
ano
Merge branc
h
'
r
t/cherry-revert-c
o
nfli
c
t-su
m
mary'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
H
amano
Merge b
r
anch 'c
b
/maint-report-m
o
unt-p
o
i
n
t
-
correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
P
ete Wyckoff
git p4 doc: f
i
x formattin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-04
N
guy
ễ
n
T
hái Ngọc Duy
Makefile: keep many variable l
i
st sorte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
N
e
il H
o
rm
a
n
git cherry-
p
ick: d
o
not dereference
a potential
N
ULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hama
n
o
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-05-03
J
unio
C Hamano
Merge b
r
a
nch 'jc/merge-r
e
du
c
e-parent
s
-earl
y
' int
o
maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Hama
n
o
Merge br
a
nc
h
'cb/cherry-pick-rev-path-
c
onfusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Haman
o
Me
r
ge br
a
nch '
c
b
/
h
ttp-multi-curl-auth' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e branch
'
mb/fetch-call-a-n
o
n-branch-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge branch
'rl/maint-s
t
ash
-
i18n-save-
e
rror' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Haman
o
Merge branch 'jm/maint-st
r
ncpy
-
di
f
f-
n
o
-index' in
t
o
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
H
a
m
a
n
o
Merge bran
c
h '
j
k/ma
i
nt-push
-
progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
ano
Merge br
a
nc
h
'nd
/
columns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff
K
i
n
g
doc/conf
i
g
:
fix
i
n
line literals
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
H
aman
o
T
h
e eighth batch o
f
topics graduated to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge
branch 'master
'
of git://git
.
bogo
m
ips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
amano
Merge branch '
t
r/xdiff-fas
t
-hash'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
H
amano
Merge branch '
j
k
/
maint-gitw
e
b-test-
u
s
e
-
s
a
n
e-perl'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hama
n
o
Merge branch 'pw/message-cleanup'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C
Hama
n
o
Merge branc
h
'zj/diff-stat
-
s
m
a
l
le
r
-
num-c
o
l
umns'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge br
a
nch
'
p
w/
p
4-various'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge branch 'jc/rerere-
t
r
a
in'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
H
amano
M
e
rge branch 'lp/di
f
fsta
t
-w
i
th-graph'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erg
e
branch 'zj
/
mksh-columns
-
b
reakage'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'jk/doc-asc
i
idoc-
i
nline-li
t
eral'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge
br
a
n
c
h
'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merge bra
n
c
h
'
mm/simple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jc/
i
n
de
x
-v
4
'
commit
|
commitdiff
|
tree
2012-05-02
Johann
e
s
Sixt
t4006:
Window
s
do not have /d
e
v/zero
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Z
b
igniew Jędrzeje
w
sk
.
.
.
diff --s
t
at: do not run diff
o
n indentical files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Zbig
n
iew J
ę
drzejewsk
.
.
.
d
i
f
f --stat:
r
eport
m
od
e
-only changes fo
r
binary files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C
Hamano
Merge
branch
'mast
e
r' of
h
t
tps://g
i
thub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Sync with v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
mano
G
i
t
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge branch '
p
w/
f
a
st-im
p
o
rt-
d
ataref-p
a
rsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge branch 'it/fetch-pack-many-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Me
r
ge b
r
anch 'j
l
/
m
aint-s
u
b
m
odule-recurse-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jc
/
maint-blame
-
m
i
nimal' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C
H
amano
Merge bra
n
ch 'lp/maint-diff-three-d
a
sh
-
with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hama
n
o
Merge branch 'jk/reba
s
e-i-submodule-conf
l
ic
t
-o
n
l
y
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
H
amano
Merge bran
c
h 'maint' of https
:
/
/
github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew J
ę
drzejewsk
.
.
.
C
onsi
s
tent
l
y
use pe
r
l
f
r
om /usr/bin/ 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 Ras
t
xdiff: choose XDL_F
A
ST_HA
S
H
c
od
e
on s
i
zeo
f
(long) ins
t
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t/
g
itweb-lib
:
use $PERL
_
PA
T
H to r
u
n
g
itweb
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzejewsk
.
.
.
t
est
s
: chec
k
--[short]s
t
at output after chmod
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Zbign
i
ew Jędrzejewsk
.
.
.
te
s
t: modernize s
t
yle of t4006
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Junio C
Hamano
log-tre
e
: the pr
e
vious one is
s
ti
l
l
not qui
t
e
r
ig
h
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jan Krüg
e
r
lo
g
-tree: use
c
ust
o
m li
n
e terminat
o
r
in
l
i
ne term
i
n
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f
K
ing
t5541: te
s
t more com
b
ination
s
of --progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff K
i
n
g
teach send-pack about --[no-]progres
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff King
s
end-pack: sh
o
w progress when isatty(2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
g
i
t p4: subm
i
t files
with wildcards
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: fix wri
t
abl
e
fil
e
afte
r
rename or c
o
py
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
P
ete Wyck
o
ff
git p4: test
submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4
:
bring back files in
d
eleted client director
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yckoff
remove bla
n
k filena
m
e
in error m
e
ssa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
Wycko
f
f
remove superfl
u
ou
s
newlines i
n
error messa
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ham
a
no
Merge branch 'ld/git-p4-tag
s
-
a
nd-
l
abels'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merg
e
b
ranch
'nh/empty-
r
ebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge b
r
anch 'jk/maint-
c
onfig-bogus
-
section'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Jędrzejewsk
.
.
.
diff --st
a
t
:
u
se l
e
ss columns for
c
ha
n
ge
co
u
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
con
t
rib/r
e
r
ere-train: us
e
ins
t
alled git-sh-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjö
r
ð
Bjarmason
git-
c
ommit: remove lego in
i
18n mes
s
a
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arn
f
jörð Bjarmason
git-commit: re
m
ove lego
in
i
1
8
n
mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Æv
a
r Arnf
j
örð Bjarmas
o
n
g
it
-
b
ra
n
ch: remove lego in i1
8
n
message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
The seve
n
th batch of t
o
pics
grad
u
ated
to '
m
aster'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge branch 'js
/
daemon-te
s
t-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
Merge br
a
nch 'kk/
g
itweb
-
omit-expen
s
ive'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch 'kk/main
t
-gi
t
w
eb-missin
g
-owner'
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io C Hamano
Me
r
ge branch 'rs/commit-
l
ist-append
'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
H
a
mano
M
e
r
ge
branch 'mm/include
-
use
r
path'
commit
|
commitdiff
|
tree
2012-04-30
Junio C H
a
mano
Merge bran
c
h
'pw/t5800-import-race-
f
ix'
commit
|
commitdiff
|
tree
next