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 Hama
n
o
apply
:
t
e
s
ts for the
--3way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: document --
3
way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: a
l
l
ow
rerere(
)
to work on --3way
resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
app
l
y: r
e
g
i
ster conflicted stage
s
t
o
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply:
--3w
a
y with add/add conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: mov
e
verify_in
d
e
x
_
m
atch()
h
igher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
m
ano
a
pply: plu
g
t
he three-w
a
y merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: fall
back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
ap
p
ly: acc
e
pt -3/--3w
a
y com
m
and line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
a
pp
l
y: move "alr
e
ady exists
"
logic to check_to_c
r
eate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
appl
y
:
m
ove check_to_c
r
eate_blob(
)
c
lo
s
e
r to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C
H
a
m
ano
apply: further
s
p
lit load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
a
n
o
a
pply: refact
o
r
"prev
i
ous p
a
t
c
h" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
apply: spl
i
t load_preimage
(
)
h
elper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly:
factor out
che
c
kout
_
targ
e
t(
)
helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
a
m
an
o
a
p
ply: refactor rea
d
_fil
e
_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: clear_image()
c
lear
s
t
h
i
ngs
a
bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
a bit mor
e
commen
t
s o
n
PATH
_
TO_B
E
_DEL
E
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fix an incomplete co
m
ment in check_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C Hama
n
o
The
n
inth
b
a
tch of
topics gr
a
duated
t
o 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio
C
Hama
n
o
Me
r
ge
branch
'nh/
e
mp
t
y-
r
e
b
ase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Merge br
a
nch '
z
j/diff
-
e
mpty-ch
m
od'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch '
j
k/
m
aint-tformat-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 '
t
h
/difftool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Start preparing
f
or 1
.
7
.
1
0
.
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-gitweb
-
t
e
s
t-use-sane-per
l
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Haman
o
Merge
b
ranch 'js
/
daemon-
t
est-race-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio
C
Ha
m
a
n
o
Merge branch 'jk/m
a
int-config-bogus-se
c
t
ion' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-07
J
unio
C
H
a
mano
Merge
b
r
a
nch 'pw/t580
0
-import-race-
f
ix' into
maint
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hamano
M
e
r
g
e branch 'rt/cherry-r
e
vert
-
c
o
nflict-
s
u
mmary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branc
h
'cb/mai
n
t-report-mount-p
o
int-co
r
rectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge b
r
a
nch
'
jc/mer
g
e-redu
c
e-parents-early
'
into ma
i
nt
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio
C Ham
a
n
o
Merge br
a
nch '
c
b
/ch
e
r
ry-pick-rev-path-c
o
nfusion
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio
C
H
am
a
no
Merge branch 'cb/http-multi-
c
url-auth' into maint
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
i
o C Hamano
Mer
g
e branch 'mb/fetch-call-a-non-bran
c
h-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e bran
c
h
'
rl/m
a
int-
s
tas
h
-
i18n-
s
ave-error' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Hamano
Merge b
r
anc
h
'jm/
m
ai
n
t-st
r
n
cpy-d
i
ff-no-index'
into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio
C Hama
n
o
Me
r
ge branch 'jk/maint-push-progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Mer
g
e branch 'nd/columns'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
n
o
The eighth batch
o
f topics grad
u
ated
to
'
master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C
Hamano
Merge br
a
nch
'mast
e
r
'
of git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Merge branch '
t
r/xdiff-fast-has
h
'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge bra
n
ch 'jk
/
maint-gitweb-test-use-sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o
C Haman
o
Mer
g
e branch 'pw
/
message-clean
u
p
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge branch '
z
j/di
f
f
-st
a
t-sma
l
l
e
r-num-columns'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge branch 'pw/p4-
v
arious'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
ma
n
o
Merge branch 'jc/rerere-tr
a
i
n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge
b
ranch '
a
b
/
i
18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
erge branch 'lp/diff
s
ta
t
-with-g
r
aph'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
n
o
Merge branch 'zj/mksh-co
l
umns-breakage'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jk/doc-asciid
o
c-inli
n
e-literal'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Mer
g
e
branch '
n
d/i18
n
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge
b
r
anch 'mm/simple
-
push'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Ha
m
ano
Merg
e
branch 'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
git
-
svn
:
in
t
rodu
c
e SVN vers
i
on com
p
arison function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Ha
m
ano
M
e
rge
branch
'ma
s
ter' of https://
g
i
thub
.
co
m
/g
i
t-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Sync w
i
th v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
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 br
a
n
ch 'pw/fast-import-dataref-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'it/fe
t
ch-pac
k
-many-refs' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Haman
o
Merge bra
n
c
h 'j
l
/maint-submodule-recu
r
se-f
e
tch' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C Ham
a
no
M
erge b
r
a
n
ch '
j
c/maint-blame-minimal
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merg
e
b
r
anch
'
lp/maint-diff-three-das
h
-with
-
gra
p
h'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
Hamano
Merge b
r
anch 'jk/r
e
ba
s
e-i-s
u
bmodule-con
f
lict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Ha
m
ano
Merge b
r
an
c
h
'ma
i
nt' of https:
/
/
g
ith
u
b
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio C Ha
m
ano
log-tree: the previ
o
us o
n
e is still
no
t
qui
t
e
right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
br
a
n
c
h 'ld/git-p4-t
a
gs-and-labels'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ham
a
no
Merge
branch '
n
h/
e
mpty-
r
eba
s
e'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Haman
o
Merge br
a
nch 'jk/maint-config-
b
og
u
s-s
e
ction'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ham
a
no
contrib/rerere
-
train:
use installe
d
g
i
t
-
sh-se
t
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Ham
a
no
The seventh batch of
topics
g
r
aduated to 'm
a
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
Merg
e
branch 'js
/
dae
m
on-
t
est-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
H
amano
M
erge b
r
anch
'
kk/gitweb-omit-expensi
v
e'
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Haman
o
Me
r
ge
b
r
a
nch 'kk/maint-git
w
e
b
-
miss
i
ng
-
owner'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Mer
g
e branch 'rs/com
m
it-list-append'
commit
|
commitdiff
|
tree
2012-04-30
J
unio C H
a
mano
Merg
e
branch 'm
m
/in
c
lude-us
e
rpath
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge
b
ranch 'pw
/
t580
0
-
i
mport-ra
c
e-fix'
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io C Hamano
Merge b
r
a
nch
'jk/rep
a
c
k-no-explode-objects-from-
o
ld
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o
C
Hamano
Merge git://git
.
bogom
i
ps
.
o
rg
/
git-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
inde
x
-v4: d
o
cu
m
ent t
h
e entry format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hamano
un
p
ack-trees: preserve the index file versio
n
of original
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
T
he
s
ixth batch o
f
topics g
r
aduat
e
d to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
H
aman
o
Merge br
a
nch '
j
c/mer
g
e-red
u
ce-parents-early'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Jun
i
o C H
a
mano
Merge
bran
c
h '
j
s/fast-impor
t
-test-9300'
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C Ham
a
no
Merge br
a
nc
h
'rt/che
r
r
y-re
v
ert-confli
c
t
-
s
u
m
m
ary'
commit
|
commitdiff
|
tree
2012-04-27
Junio C H
a
mano
Merge bran
c
h '
c
b/maint-
r
eport-mount-point-correctl
y
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
Hamano
Merge branc
h
'cb
/
ch
e
rry-pick-rev-path-confusion'
commit
|
commitdiff
|
tree
2012-04-27
Jun
i
o C Hamano
M
e
rge
b
ranch 'cb/
h
ttp-multi-curl
-
auth'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge br
a
nch 'zj
/
m
ksh-columns-bre
a
k
age' into
l
p
/
d
iffstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
amano
Upda
t
e draft relea
s
e
n
o
t
e
s to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
Hamano
Merg
e
br
a
nch 'rl/maint-stash-i18n-sa
v
e-error'
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge b
r
an
c
h 'mb/fetc
h
-call-a-
n
on
-
branch-a-ref'
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
g
e
branch 'jm/maint-strncp
y
-diff
-
no-ind
e
x'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
r
ge b
u
ndle error message
fix in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Start p
r
eparing
f
or 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Merge branch 'jk/run-command
-
eac
c
e
s' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o
C
Hamano
M
e
r
ge
branch
'
jc
/
push-upstream-sanity' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Merge branch 'jc/maint-clea
n
-nested-workt
r
ee-in-s
u
bdir
.
.
.
commit
|
commitdiff
|
tree
next