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: document --3way option
2012-07-09
Junio C Hama
n
o
a
p
p
ly: document
-
-3way opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
llow
r
erere() to
w
or
k
on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: r
e
gister conf
l
ict
e
d stag
e
s to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
app
l
y
: --3way with
a
dd/ad
d
c
onflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move verif
y
_i
n
dex_ma
t
ch() hig
h
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug
the three-way merge
logic
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall back on
three
-
wa
y
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: accep
t
-3/
-
-3way
comma
n
d line opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: move "already
e
x
i
sts" logic to
check_to_create(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
m
o
ve check_t
o
_
c
reate_blob
(
) closer to its
s
o
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
p
ply: f
u
rther
split
l
oad_pre
i
mage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "p
r
e
vious patc
h
"
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split loa
d
_preimag
e
() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
app
l
y
: fac
t
or
o
ut checko
u
t_
t
arget() helper
f
u
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
a
n
o
ap
p
ly: refac
t
or read_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
p
ply:
clear_imag
e
() clear
s
thin
g
s
a
bi
t
m
ore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a
b
it mo
r
e
c
omment
s
on PA
T
H_TO_BE_
D
ELETE
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fix an incomplete
c
om
m
e
n
t in
c
h
eck
_
patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
aman
o
The ninth batch of
topics graduated to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
Hama
n
o
Merge branch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Mer
g
e
b
r
anch 'zj/
d
iff-empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Mer
g
e branch '
j
k/maint-tfo
r
mat-with-z'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge branch 'th/
d
i
f
f
tool
-
diffall'
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C H
a
mano
S
y
nc w
i
t
h
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
a
m
ano
Start pr
e
paring for
1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge br
a
nch 'jk/maint-gitweb-test-
u
se-san
e
-perl' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branc
h
'js/daemon-test-race
-
fix' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C H
a
ma
n
o
M
e
rge branch 'jk/maint-co
n
fig-bo
g
us-section' into
m
ain
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branc
h
'pw/t5800-import-
r
ace-
f
ix' into
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge
b
ranch 'rt/cherry-r
e
vert-conflict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branc
h
'cb/
m
aint-
r
eport-mount-point-cor
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyckoff
g
i
t p4 doc:
f
ix formatt
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-04
Nguyễn
Thái N
g
ọc Duy
Makefile: ke
e
p many variab
l
e list sorte
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
N
e
i
l
Horman
git cherr
y
-p
i
ck: do not dereference a potential NULL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Mer
g
e bra
n
ch
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Ha
m
a
n
o
Merge branch 'jc/mer
g
e-reduce-pare
n
t
s
-early' into m
a
int
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C
H
a
m
a
no
Merge br
a
nch 'cb/c
h
e
rry-pick-rev
-
path-confus
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Haman
o
Merge branch
'
cb/
h
ttp-multi-curl-auth' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Ha
m
ano
Merge branch 'mb/fetc
h
-c
a
ll-a
-
no
n
-bran
c
h-a-r
e
f
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Merg
e
b
ranch 'rl/maint-stash-i1
8
n-save-error'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C Hamano
Merge branch 'jm/ma
i
nt-s
t
rncpy-diff-n
o
-index' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o
C
Hamano
Merge branch 'jk/maint-
p
ush
-
pr
o
gress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Haman
o
Merge branch 'nd/c
o
lumns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff
K
i
n
g
doc/
c
onfig: fi
x
inlin
e
literals
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
The e
i
ghth batch of
t
o
pics graduated to
'
master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge bra
n
ch 'master' of git://git
.
b
o
gomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o C Hamano
Merge bran
c
h
'tr/xdiff-fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Ha
m
ano
Merge br
a
nch 'jk
/
main
t
-gitweb-test-use-sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
n
o
Merge
b
ranch '
p
w/messa
g
e-c
l
eanup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch
'zj/diff
-
stat-smaller
-
num-c
o
lumns'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
am
a
no
Merge branch 'pw/p4-various'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Mer
g
e
branch 'jc/rerere
-
t
r
ain'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
an
o
Merge bra
n
ch 'ab/
i
18n'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o C Hamano
M
erge branch
'
lp/diffstat-with-graph'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Ha
m
an
o
Merge
b
ranch
'zj/mk
s
h-co
l
umns
-
br
e
a
k
age'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C H
a
man
o
Mer
g
e b
r
anc
h
'
j
k/doc-a
s
ciidoc-inline-
l
i
t
e
ral'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o C Hamano
Merge branch
'nd/i18
n
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Mer
g
e branch
'mm/simple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'jc/
i
nd
e
x-v4'
commit
|
commitdiff
|
tree
2012-05-02
Johan
n
es Si
x
t
t4006: Windows do not have /dev
/
ze
r
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Z
b
ign
i
ew Jędrzejewsk
.
.
.
d
iff --s
t
at: do n
o
t run diff
o
n indentical files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbi
g
ni
e
w Jędrze
j
ewsk
.
.
.
di
f
f --stat:
r
eport mode-
o
n
ly
c
hanges for binary files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Ha
m
a
n
o
Merge branch 'master' o
f
https://githu
b
.
c
om/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C H
a
man
o
Sy
n
c w
i
th v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
J
unio C
H
amano
Git 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hama
n
o
M
erge
branc
h
'pw/fast-import-datar
e
f-parsin
g
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
H
amano
Merge
branch 'it/
f
etch-pack-many-refs
'
into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Merge branch 'jl/maint-
s
ubmodule-rec
u
rse-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merge branch
'jc/ma
i
nt-blame-minimal
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge
branc
h
'l
p
/
maint-
d
i
ff-three-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'jk/rebase-
i
-submodule-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'maint' of h
t
tps
:
//github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzej
e
wsk
.
.
.
Consistently u
s
e
p
erl
f
r
o
m /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
Th
o
ma
s
Rast
x
diff
:
choose XDL_FAST_HASH code on sizeof
(
long) instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff Kin
g
t/gitweb
-
lib: use
$PERL_P
A
TH
to
run gitweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzejewsk
.
.
.
tests: check --[sh
o
r
t
]stat outp
u
t aft
e
r c
h
mod
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrze
j
ewsk
.
.
.
t
e
st: modernize style of t4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Ju
n
i
o C
Haman
o
log-tre
e
: the pre
v
i
o
u
s on
e
is still not quite ri
g
ht
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan Krüger
log-
t
ree: us
e
c
u
stom line term
i
na
t
or in line term
i
nation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t55
4
1: test m
o
re combinations o
f
-
-progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
King
teach
s
end-p
a
c
k
a
bout --[no-]progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
s
e
nd-
p
ack:
show progress when
is
a
tty(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyc
k
off
gi
t
p
4
: submit f
i
le
s
with wildcards
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
ete Wy
c
koff
git p4: fix writable f
i
le after rename or copy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te Wyck
o
f
f
git p4: test submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyck
o
ff
git
p4
:
bring
b
ack
f
iles i
n
de
l
eted client
di
r
ectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
remove blank filenam
e
i
n e
r
ror message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pet
e
W
yckoff
remove sup
e
rfluous newlines in error me
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge bra
n
ch 'ld/g
i
t
-p4
-
tags-and-labels'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C
Ham
a
n
o
Merge branch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Ha
m
ano
Merge branch 'jk/
m
aint-config-bo
g
us-s
e
ction'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Ję
d
r
zejewsk
.
.
.
diff
-
-stat:
u
se le
s
s
c
o
l
umns for
chang
e
c
o
unts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio
C H
a
mano
c
ontrib/re
r
ere-t
r
ain: use installed gi
t
-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfj
ö
rð B
j
armason
git-commit: remove l
e
go in i
1
8n messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar A
r
n
f
jörð Bjarm
a
son
git-comm
i
t
:
remove lego in i18n mess
a
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æv
a
r
A
rnfjörð Bjar
m
aso
n
git-branch: remove leg
o
in i18
n
mes
s
age
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Hamano
The se
v
enth
b
atch of t
o
pics graduated to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merg
e
branch '
j
s/daemon-te
s
t
-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merg
e
branch 'kk
/
gitw
e
b
-
omit-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io C
H
aman
o
Merge b
r
a
nch 'kk/maint-g
i
tweb-m
i
ssing-o
w
ner
'
commit
|
commitdiff
|
tree
next