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: tests for the --3way option
2012-07-10
Junio C Ham
a
no
apply: tests
f
or the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
app
l
y
:
document
-
-3way o
p
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
amano
app
l
y: allow rerere() to w
o
r
k on --3wa
y
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
appl
y
: register conflicted
stages t
o
the in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
apply: --3way with add/add confli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
ma
n
o
apply: move verify_inde
x
_match()
h
ighe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
a
pply: plug
the three-way merge
l
ogic
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
appl
y
: fall back on t
h
ree-way
m
e
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
ap
p
ly:
acc
e
pt -3/-
-
3
w
ay command line
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
apply: move "already
e
xists" logi
c
to check_to_
c
reate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
apply: move chec
k
_to_
c
reate_
b
lob() closer to
its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
apply
:
further sp
l
it lo
a
d_
p
reimag
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: refac
t
or "pre
v
ious patch" logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly:
s
plit load_preimage() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: facto
r
o
ut che
c
k
o
ut_target() helper
functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
ppl
y
: re
f
actor rea
d
_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply:
c
l
e
ar_image
(
) clears thing
s
a bit
more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply: a bit mo
r
e comments
on PATH
_
T
O_BE_D
E
LETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
apply: fix
a
n
i
n
co
m
plete com
m
ent in ch
e
ck_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Th
e
ninth batch of to
p
ics g
r
aduated
t
o 'mas
t
e
r'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Hamano
Merg
e
branch
'
nh/em
p
ty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
g
e
bra
n
ch 'zj/diff-empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hama
n
o
Merg
e
b
r
anch 'jk/ma
i
nt-tf
o
rma
t
-with-z'
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hamano
Merge b
r
a
n
ch 't
h
/
diffto
o
l-diffall
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Sy
n
c with
maint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Ha
m
ano
Start pre
p
aring for 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Merge branch
'
jk/maint
-
gitweb-test-use-s
a
ne-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C
Hamano
Merge br
a
n
c
h
'js/daem
o
n-test-race-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge branc
h
'j
k
/mai
n
t-config-bogus-sec
t
ion' into main
t
commit
|
commitdiff
|
tree
2012-05-07
J
unio
C
Hamano
Merge b
r
anch 'pw/t5800-impo
r
t-race-fix' into
m
aint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge branch 'rt/cherry-revert-conflict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Merge bran
c
h
'cb/maint-
r
eport-mount-point-corr
e
ctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
P
ete W
y
c
koff
git
p4 d
o
c: fix forma
t
tin
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 man
y
variable list sor
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Ne
i
l Horm
a
n
git cherry-pick:
d
o not dere
f
erence a potential NULL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hama
n
o
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ham
a
no
Merge branch 'jc/
m
erge-
r
ed
u
ce
-
pare
n
ts-early' into maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
Hamano
Merge branc
h
'cb/cherry-pick-re
v
-pa
t
h
-
conf
u
sion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
amano
Merge branch
'
cb/http-mul
t
i-cur
l
-
a
u
th' into maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C H
a
m
a
no
M
e
rge branch
'
mb/f
e
tch
-
call-a-non
-
b
r
a
nch-a-re
f
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
n
i
o
C
Ha
m
a
no
M
e
r
g
e
branch 'rl/maint
-
stash-i18n-save-erro
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
M
er
g
e branch 'jm/ma
i
nt-strncpy-diff
-
n
o
-i
n
dex' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Merge branch 'jk/
m
aint-push-prog
r
ess'
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C
H
a
m
ano
Mer
g
e branch 'nd/
c
olumns'
commit
|
commitdiff
|
tree
2012-05-03
Jeff King
doc/
c
on
f
ig: fix i
n
lin
e
literals
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
The
eighth batch of topics gradu
a
ted to 'ma
s
ter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C H
a
mano
M
erge branch
'
master' of git://
g
it
.
bogomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o C Hamano
M
e
rge br
a
nch 'tr/xdiff
-
fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
aman
o
Merge br
a
n
ch '
j
k/ma
i
nt-gitweb-test-
u
se-sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C Hamano
Merge branch 'pw/message-cle
a
nup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hama
n
o
Merge branch 'zj/diff-stat-smaller-n
u
m-column
s
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
p
w/p4-various'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
mano
Merge
b
r
anch 'j
c
/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branc
h
'
a
b
/
i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Ham
a
n
o
Merge branch
'lp/diffs
t
at-with-grap
h
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'zj/mksh-col
u
mns-brea
k
age'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge bra
n
c
h
'jk/doc-asciidoc-i
n
line-lite
r
al'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merge branch '
n
d/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge br
a
nch '
m
m/simple-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge
b
ranch 'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Johann
e
s
Sixt
t4006: Windows do no
t
h
a
ve /dev/zero
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Z
bigniew Jędrzejewsk
.
.
.
d
i
ff
-
-stat:
do
n
o
t run diff on indentical files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbigniew Jędrze
j
ewsk
.
.
.
diff
--stat: report mode-only c
h
ange
s
for binary files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
b
r
a
nch 'ma
s
t
er'
o
f https://git
h
ub
.
com/g
i
t-
l
10
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C Hamano
Sync w
i
th v1
.
7
.
10
.
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
u
nio C H
a
ma
n
o
Merge
branch 'pw/
f
ast-import-dataref-pa
r
sing
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C H
a
mano
Merge branc
h
'i
t
/fetch-
p
ack-m
a
ny
-
refs' into
maint
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C Hamano
Merge
branch '
j
l/maint-s
u
b
m
odule-r
e
curse-fetch'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge b
r
anch 'jc/maint-bl
a
me-minimal
'
into maint
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
M
e
rg
e
branch 'lp/maint-di
f
f-
t
hree-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io
C
Hamano
Merge bran
c
h
'jk/rebase-i-submodule-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o C Hamano
M
erge branch
'
maint' of h
t
t
p
s
:
//github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew J
ę
drzejewsk
.
.
.
Co
n
sistentl
y
use
perl from /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
Thomas Ras
t
xdiff: choose XDL_FAST_
H
ASH
code on sizeof
(
long)
i
nstead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
e
f
f King
t/gitweb-
l
ib: use $PERL
_
PATH to
r
un gitweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzeje
w
sk
.
.
.
tests: check --[s
h
ort]stat output af
t
er chmod
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbi
g
niew
J
ę
drzejewsk
.
.
.
test:
mo
d
erniz
e
style of t4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Junio C H
a
ma
n
o
lo
g
-t
r
ee: the pre
v
ious
o
ne is still not quite ri
g
ht
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan K
r
üge
r
log-tree:
u
se custo
m
line termina
t
or i
n
line termination
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t5541:
test mor
e
combi
n
ations
of --p
r
og
r
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
teach send-pack about --[no-]prog
r
e
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
send-pack: show progress w
h
en isatty(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckof
f
git p4: submi
t
files
w
ith
w
i
ldcards
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wy
c
kof
f
git
p
4: fix w
r
itable file
a
fter r
e
name o
r
co
p
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
ete
Wyckof
f
git p
4
: test submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
ete Wyckoff
gi
t
p
4
: bring back
f
i
l
es in deleted client directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pe
t
e Wy
c
koff
r
e
m
ove
blank filename
i
n error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
yck
o
f
f
remove s
u
perfl
u
ou
s
newlines i
n
error messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io
C Hamano
Merge branch 'l
d
/git-p4-ta
g
s-a
n
d-labels'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Haman
o
Mer
g
e branch 'nh
/
emp
t
y-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch 'jk/maint-config-bogus-section
'
commit
|
commitdiff
|
tree
2012-04-30
Zbi
g
niew Jędrzej
e
wsk
.
.
.
diff --stat: u
s
e less co
l
umns
for change count
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
u
ni
o
C H
a
mano
cont
r
ib/rerere-t
r
ain: use
i
nstal
l
ed g
i
t-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjar
m
a
s
o
n
g
it-commit: remove lego i
n
i
1
8n
m
e
s
s
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmason
git-commit:
r
emove lego in i18n messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Ar
n
f
jörð
B
j
armason
git-branch:
remove lego in i18n m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
The
seventh batch of to
p
ic
s
gr
a
duated to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio
C Hama
n
o
Mer
g
e
b
r
a
nch 'js
/
d
a
emon-test-
r
ace-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
Merge bra
n
ch '
k
k/gitweb-omit-expensive'
commit
|
commitdiff
|
tree
next