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
J
unio C Hamano
appl
y
: tests for
t
h
e -
-
3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
apply
:
document --3way
o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: allow rere
r
e()
to work on --3w
a
y
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
re
g
ister conflicted stages t
o
th
e
i
nd
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
-
-3way with
add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
a
pply: move verify_
i
nde
x
_m
a
t
ch() hig
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
app
l
y
: pl
u
g
t
he
t
hree-way merge
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: fa
l
l back
on th
r
e
e-w
a
y mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: ac
c
ept -3/--3
w
a
y
c
o
mm
a
nd
l
ine opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
apply:
m
ove "already exi
s
ts"
l
o
g
i
c
t
o check_to_crea
t
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
p
pl
y
: move
c
heck_to_create_b
l
ob() closer t
o
it
s
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y
: further
split load_
p
reimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
apply: refa
c
to
r
"p
r
e
vious
p
atch" l
o
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
split loa
d
_pr
e
i
m
age() helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: f
a
ctor out che
c
k
o
u
t_ta
r
get()
h
elper functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
pply
:
r
e
factor read_file_or
_
gi
t
link
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
apply: cle
a
r_ima
g
e
(
) clears things a
bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
apply: a bit more comments on PATH_TO
_
BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
f
i
x
an inc
o
mplete comment in chec
k
_p
a
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Th
e
n
i
nth batch of
top
i
cs graduated to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio
C
Hamano
M
e
rge
bran
c
h 'nh/empty-r
e
bas
e
'
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Ha
m
ano
Merge branch 'zj/di
f
f-empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hamano
M
erge branch 'j
k
/maint-
t
f
o
rmat-with
-
z
'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hama
n
o
Merge
br
a
nch 'th/
d
i
fftool-diffal
l
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
a
m
a
no
Sync with maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Start preparing f
o
r 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge b
r
a
n
c
h 'jk/maint-gitweb-
t
est-us
e
-sane-per
l
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C H
a
mano
Merge bran
c
h 'js/daemo
n
-test-race-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge branch
'jk/mai
n
t-config
-
bogus-section' into
m
a
int
commit
|
commitdiff
|
tree
2012-05-07
J
unio C
Hamano
Mer
g
e b
r
anch 'pw/t5800
-
import
-
r
a
ce-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C
Ha
m
ano
M
e
r
g
e
branch 'rt/che
r
ry-revert-con
f
lict-s
u
mmary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch 'cb/maint-re
p
ort-mount-point-cor
r
e
ctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
erge bran
c
h
'
jc/merge-reduc
e
-paren
t
s
-early' into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
e
rge branch 'cb/che
r
r
y
-
pick-rev-pa
t
h-
c
on
f
usion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'cb/http-mult
i
-curl-auth' into m
a
int
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Merge branch '
m
b
/fe
t
ch-call-a-non-br
a
nc
h
-a-re
f
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Hamano
Merge bran
c
h '
r
l/m
a
int-stash-i1
8
n
-
save-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Haman
o
Merge branch 'jm/maint-s
t
rncpy-diff-no
-
i
ndex' int
o
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge br
a
nch 'jk/maint-push-progress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge b
r
a
nch 'n
d
/co
l
um
n
s'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
T
he
e
ighth b
a
t
c
h of
t
opics graduated to 'mast
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Mer
g
e
b
ranch 'master' of
git://git
.
b
o
g
omips
.
or
g
/
g
it
-
sv
n
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
H
a
m
ano
Merg
e
br
a
nch 'tr/
x
diff-fast-ha
s
h'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branch
'jk/
m
aint-gitweb-te
s
t-
u
se-sane-p
e
rl'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C Hama
n
o
Merge branch 'pw/message-
c
leanup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'zj/diff-sta
t
-
small
e
r
-num-columns'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hama
n
o
Merg
e
br
a
nch '
p
w/
p
4-various'
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C Hamano
Merg
e
branch 'jc/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
man
o
Merge branch 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
e
rge bran
c
h 'lp/
d
iffs
t
at-with-graph
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
z
j
/mksh-col
u
mns-breakag
e
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merg
e
branch 'jk
/
doc-asc
i
idoc-i
n
line-litera
l
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge
b
ranch '
n
d
/
i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
M
erg
e
bran
c
h 'mm/s
i
mple
-
push'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
Hamano
M
e
r
ge branch
'
jc/i
n
dex-v4'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C
Hamano
git
-
svn: intr
o
duce
SVN versi
o
n compa
r
ison fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Ham
a
no
Merge branch 'ma
s
t
er' of https://github
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Sync with 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
Jun
i
o C Haman
o
Merge
branch 'pw/f
a
st-impo
r
t-
d
ata
r
ef-parsin
g
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'it/fetch-pack-m
a
ny
-
refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge
br
a
nch 'jl/maint-submodule-recurse-fetch' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
jc/maint
-
blame-minim
a
l' into m
a
int
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
a
no
Me
r
ge branch 'lp
/
maint-diff-thr
e
e-d
a
sh-w
i
th-
g
raph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
a
m
ano
Me
r
ge branch 'jk/rebase-i
-
submodule-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hama
n
o
Merge
bra
n
ch 'main
t
'
o
f http
s
://gith
u
b
.
com/git
-
l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio C Hamano
l
o
g
-tree: the previous one
is still not quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
unio
C Hamano
Merg
e
b
ranch 'ld/git-p4
-
tags-and-labels
'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hamano
Mer
g
e
branch 'nh/emp
t
y-re
b
ase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Me
r
ge bra
n
ch '
j
k/m
a
int
-
config-bogus-se
c
tion'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
c
ontrib/rerer
e
-train: us
e
i
n
stalle
d
git-sh
-
s
e
t
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C H
a
mano
The sevent
h
batch of topics
g
raduated to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Hamano
Merge
b
ranch
'js
/
daem
o
n
-test-ra
c
e-fix'
commit
|
commitdiff
|
tree
2012-04-30
J
unio C H
a
mano
Mer
g
e branch
'
kk
/
gitweb-
o
mi
t
-expensive'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Haman
o
Merge
branc
h
'k
k
/ma
i
nt-gitweb-missi
n
g
-
o
wner'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branc
h
'rs/
c
ommit-l
i
s
t-append'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branc
h
'mm/in
c
lude-
u
serpath'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch 'pw/t5
8
00-import-
r
ac
e
-
f
i
x
'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hamano
Mer
g
e
branch 'jk/repack-no-explode-objects-f
r
o
m
-
o
ld
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
Merge
git://git
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
index-v4: do
c
u
m
ent
the entry format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C
H
amano
unpack
-
trees:
pres
e
rve the index file vers
i
o
n of origina
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
The sixth batch
o
f topics graduate
d
to 'mas
t
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hamano
Merge branch 'j
c
/merge
-
reduce-p
a
rents-early'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io
C Hamano
M
erge branch 'js/fast-im
p
ort
-
t
est-
9
300'
commit
|
commitdiff
|
tree
2012-04-27
J
unio
C Hamano
Merge bran
c
h 'rt/cherry-rev
e
rt
-
c
onfl
i
ct-summ
a
ry'
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
Hamano
Merge branch 'cb/m
a
int-repor
t
-mount-point-
c
or
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Juni
o
C H
a
mano
Merge
branch 'cb/cherry-p
i
ck-rev-path-conf
u
sion'
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hamano
Merge
b
r
a
nch
'cb/
h
t
t
p-mul
t
i-cu
r
l-aut
h
'
commit
|
commitdiff
|
tree
2012-04-27
Junio C H
a
mano
M
e
rge branch 'zj/mksh-columns-
b
reak
a
ge
'
into lp
/
diff
s
t
a
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Update d
r
a
f
t
release notes
to
1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
ge
b
ranch
'rl/maint-stas
h
-i18n
-
save-error'
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Merge
bran
c
h 'mb/fetch-call-a-non-branch-a-ref'
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
erge branch '
j
m/maint
-
s
t
r
ncpy-
d
iff-no-in
d
ex'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
m
a
no
Merge
bundle e
r
ror message fix i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Start pre
p
ari
n
g
f
or
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Merge branch 'j
k
/run-command-e
a
cces' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge bra
n
c
h
'j
c
/push-upstream-sanity' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
H
amano
Merge branch 'jc/maint-clean-nested-work
t
ree-
i
n-
s
ubdir
.
.
.
commit
|
commitdiff
|
tree
next