repo.or.cz
/
git
/
jrn.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 Hamano
apply:
t
est
s
for the --3way op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pp
l
y:
document --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
ap
p
l
y
: allow rerere(
)
to work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
apply: registe
r
c
onflicted st
a
ges to the
i
ndex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: --3way with a
d
d/add c
o
nflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Ham
a
no
apply: mo
v
e v
e
rify_index_match() high
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
an
o
apply: plug the th
r
e
e-way merge
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply
:
fall
b
ack on
t
hree-way mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly
:
a
c
cept -3/--3
w
ay co
m
mand line o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: m
o
ve "
a
lr
e
ad
y
ex
i
sts" logic to check_to_cr
e
ate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
appl
y
: move
c
heck
_
t
o
_
c
re
a
te_blob() closer
t
o its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pp
l
y: further
split load_pre
i
m
a
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply
:
refactor "previous
pa
t
ch" lo
g
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
a
pply
:
split load_
p
reima
g
e() helper fu
n
c
t
io
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hama
n
o
a
pply: factor out checkou
t
_
target
(
) helper functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: refac
t
or
r
e
ad_fil
e
_or_gitlin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
apply: clear_
i
mage
(
) clears
t
hings
a b
i
t
more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
apply: a
bit
m
ore
c
omm
e
nts on PATH_TO_
B
E
_
DELET
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: fi
x
an incomplete c
o
mment in check_pat
c
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
The nin
t
h batch of topic
s
gr
a
d
u
at
e
d
to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merg
e
b
ranch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
Merge branc
h
'zj/d
i
ff-empty-chm
o
d
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Merge bra
n
ch 'jk/mai
n
t-tformat-with-z'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Hamano
Mer
g
e
branch 'th/difftoo
l
-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Sync with m
a
i
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Start pr
e
paring for 1
.
7
.
10
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Ha
m
ano
Merge branch 'jk/main
t
-
gitweb-
t
est-
u
s
e-sane-perl
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
erge branch 'js/dae
m
on
-
t
e
st-race
-
fix'
into maint
commit
|
commitdiff
|
tree
2012-05-07
J
unio
C
Hamano
Merge bra
n
ch 'jk
/
mai
n
t-config-bog
u
s-secti
o
n' into
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'pw/
t
5800-
i
mport-race-fix'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C
Hamano
Mer
g
e bran
c
h 'rt
/
cherry-revert-conflict-
s
ummary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
M
erge branch 'cb/maint-repo
r
t
-
mount-point-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
ano
Merge b
r
anch
'jc/merge-reduce-pa
r
en
t
s-early' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C
H
amano
M
erge br
a
nch 'cb/cherry-pick-rev-path-confusion' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C H
a
mano
Merge branch 'cb/
h
ttp-multi
-
curl-auth' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Ha
m
ano
Me
r
ge branch 'mb/fetc
h
-
c
all-a-non
-
b
ranch-a-ref'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Hamano
Me
r
ge bran
c
h '
r
l/maint-
s
tash
-
i18
n
-save-
e
rror' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e
branch 'jm/m
a
i
n
t-st
r
ncpy-diff-
n
o-index' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Me
r
ge branch '
j
k/maint-
p
ush-progress'
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C
H
amano
M
e
rge branch 'nd/co
l
umns'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Th
e
e
ig
h
th batch of topi
c
s gra
d
uated to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merg
e
branch 'master' of git://
g
it
.
bogomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Junio
C H
a
mano
Merge bra
n
ch 'tr/xdiff
-
fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge branch 'jk
/
maint-gitweb-test-use-sa
n
e-perl
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
a
mano
Merge branch 'pw/messag
e
-cleanup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Mer
g
e
branch 'z
j
/di
f
f-
s
tat-
s
m
a
ller-num-columns'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
M
e
rge b
r
a
nch 'pw/p
4
-v
a
rious'
commit
|
commitdiff
|
tree
2012-05-02
J
un
i
o C Hamano
Merge bran
c
h 'jc/rerere-tr
a
i
n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Me
r
ge
b
ra
n
ch 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge branch '
l
p/diffstat-with
-
graph'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
Merge branch 'zj/mksh-columns-breakage
'
commit
|
commitdiff
|
tree
2012-05-02
J
unio
C Hama
n
o
Merge branc
h
'
j
k/doc-ascii
d
o
c-inline-lit
e
r
a
l
'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
Hamano
Mer
g
e
br
a
nch 'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Merge branch
'
mm/
s
imple-push'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io
C H
a
mano
Merge branch 'jc/index
-
v4'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
g
i
t-svn: in
t
roduce SVN version compar
i
son fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'm
a
ster' of ht
t
ps://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
a
m
ano
Sync with
v
1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C H
a
mano
Git
1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merg
e
b
r
anch
'
pw/fast-impor
t
-
d
at
a
r
ef-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hama
n
o
Merge branch 'it
/
fe
t
ch-pack-many-refs
'
int
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Mer
g
e branch 'jl/maint-submodule-
r
ecurse-fetch'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Haman
o
Merge branch
'jc
/
main
t
-blame-minimal' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C H
a
man
o
Merge branch 'lp/m
a
i
n
t-
d
iff-t
h
ree-dash-with-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Me
r
ge
branch 'jk/reb
a
se-i-
s
ub
m
odule-con
f
lict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Ham
a
no
M
e
rge
b
r
an
c
h
'
m
aint' o
f
https:/
/
github
.
com/git-l
1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio C Hamano
lo
g
-tree: the
p
revio
u
s
one is still not quite
r
ight
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
Merge bran
c
h
'
ld/gi
t
-p4-tags-and
-
lab
e
ls'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
M
erge branch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
Merge branch 'jk/maint-conf
i
g
-
bogus-section'
commit
|
commitdiff
|
tree
2012-04-30
Junio C H
a
mano
contrib/rerere-
t
r
a
in: use in
s
talled git-s
h
-
setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Hamano
The
s
eventh batch of topics grad
u
ated
to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Me
r
ge
b
ra
n
ch 'js/daemon-test-ra
c
e-fix'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge branch 'kk/gitweb-omit-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
i
o
C Hamano
Merge branch
'
kk/mai
n
t-gi
t
web-missing-owner
'
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Ham
a
no
Merge branch 'rs/commit-list-
a
ppend'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
b
ranc
h
'mm/inclu
d
e-
u
se
r
pa
t
h
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
M
erge branch '
p
w/t580
0
-import-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
M
erge branch 'jk/repack-no-exp
l
o
de-ob
j
ect
s
-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
J
unio
C Hamano
Mer
g
e git://git
.
bog
o
mips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
Ha
m
a
n
o
index-v4: document the entry format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
J
uni
o
C Ham
a
no
un
p
a
c
k
-
trees: preserve
the ind
e
x
f
ile version of original
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C Hamano
Th
e
sixth bat
c
h of topics gra
d
uated to
'
master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-27
Junio
C Hamano
Merge branc
h
'jc/merge
-
reduce-parents-early'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge
br
a
nch
'js/fas
t
-imp
o
rt-test-9300'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hama
n
o
Merg
e
branch 'rt/c
h
erry
-
revert-conflict-summ
a
ry'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge b
r
an
c
h
'c
b
/
m
aint-repor
t
-mount-poi
n
t-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Juni
o
C
Hamano
Merg
e
bra
n
ch 'cb/cherry-pi
c
k-rev-path
-
confusi
o
n'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ham
a
no
M
e
rge
b
ranch 'cb/http-m
u
lti-cu
r
l-auth'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hama
n
o
Merge
b
ranch 'z
j
/mksh-col
u
mns-breakage' into lp/di
f
f
s
tat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
U
p
date
d
raft rele
a
se notes to 1
.
7
.
11
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge
b
ranch 'rl/main
t
-
s
t
ash-
i
1
8n-save-er
r
or'
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
man
o
Mer
g
e
bran
c
h 'mb
/
fetch-call-a-non-br
a
nch-a-r
e
f'
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
rge bran
c
h 'jm/maint-strncpy-diff-no-inde
x
'
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C H
a
mano
Merge
b
undl
e
error messa
g
e fix i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C Ha
m
ano
Start
p
repa
r
i
n
g for 1
.
7
.
10
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C
H
a
mano
Merge branch
'jk/run-command-ea
c
ces' into
m
ain
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Me
r
ge branch 'jc/push-upstream-sanity'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Ha
m
ano
M
erge branch 'jc/main
t
-c
l
e
a
n-nested-work
t
ree
-
in-s
u
bd
i
r
.
.
.
commit
|
commitdiff
|
tree
next