repo.or.cz
/
git
/
mjg.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
appl
y
: tests for the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
ap
p
l
y
:
doc
u
ment --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
p
p
ly
:
al
l
ow
r
erere() to work on --3way r
e
s
ult
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register conflict
e
d st
a
g
e
s to t
h
e index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
pply: --3way with add/add conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply: move veri
f
y_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
apply: pl
u
g the three-way mer
g
e
l
ogic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
p
ly: fall bac
k
on th
r
ee
-
w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply:
a
ccept -3/--3way comm
a
n
d
line opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: m
o
ve
"
already exists
"
logic to
c
heck_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move check_t
o
_creat
e
_blob()
c
l
oser t
o
its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: furth
e
r
split load
_
pre
i
mage
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: ref
a
c
t
or "pr
e
vious patch" lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
apply: split l
o
ad_preim
a
g
e() helpe
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
am
a
no
apply: factor
o
ut checko
u
t_tar
g
et() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
refactor re
a
d
_
fil
e
_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
cl
e
ar_image() clea
r
s things
a
bi
t
m
o
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
man
o
appl
y
: a bit more comments on
P
A
T
H
_
TO_BE_D
E
LETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
H
amano
apply: fix an incomp
l
ete comm
e
nt in
check_patch(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hama
n
o
The ninth bat
c
h
o
f
t
o
pic
s
g
r
a
du
a
te
d
to 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
ge
b
ranch 'nh/e
m
pty-rebas
e
'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merg
e
branch 'zj/diff-empty-c
h
mod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
M
erge branch 'jk/
m
aint-tformat-with-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
Merge branch 'th/difftool-diffall'
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
H
ama
n
o
Sync with maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
amano
St
a
rt preparing
f
or
1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
unio C Hama
n
o
Merge b
r
anch
'jk/ma
i
nt-gitweb-test
-
use-sane
-
perl'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
io C Hamano
Merge
branch 'js/daemon-t
e
st-r
a
ce-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Hamano
Me
r
ge branch
'
jk/maint-config-bogus
-
s
e
c
tion'
i
nto
maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o
C Hamano
Merge
b
ranch 'pw/t58
0
0-import-race-f
i
x' into main
t
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io
C
Hama
n
o
Merge branch 'r
t
/cherry-revert-co
n
flict
-
summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merg
e
bran
c
h 'c
b
/
m
ai
n
t-rep
o
rt-mount-point-
c
orrect
l
y
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge b
r
anch 'jc/merge-reduce-pare
n
ts-ear
l
y
'
into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C
H
amano
Merge bran
c
h 'cb/cherry
-
pick-rev-path-confu
s
i
on' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio C Haman
o
M
erge
br
a
nch 'cb/http
-
multi-curl-auth' into main
t
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hama
n
o
Merge bra
n
ch 'mb/f
e
tch
-
c
a
ll-a-non-branch-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
e
rge br
a
nch 'rl/maint-stas
h
-
i18n-save-
e
rror' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C H
a
man
o
Merge branch 'jm/maint-st
r
ncp
y
-diff-no-index' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Ham
a
no
Mer
g
e
br
a
nch 'j
k
/maint-push-pro
g
ress
'
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Merge
bra
n
ch 'n
d
/col
u
mns'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Ha
m
ano
The eighth batc
h
of t
o
pics gr
a
d
u
ated to 'ma
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch 'mast
e
r' o
f
git:/
/
git
.
bogomip
s
.
org/gi
t
-sv
n
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ha
m
ano
Me
r
ge branch 'tr/xdiff-
f
as
t
-hash'
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C Hamano
Merge bran
c
h 'jk/maint-
g
i
t
web-te
s
t-use-sane-pe
r
l'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C H
a
m
a
no
Mer
g
e bra
n
ch 'pw/message-cl
e
anup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge b
r
anch 'zj/di
f
f-
s
t
at-smaller-
n
um-columns'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Ham
a
no
Merge bra
n
c
h 'pw/p4-v
a
rious'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jc/r
e
rere-tr
a
in'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Merge bran
c
h 'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hamano
Merge branch 'lp
/
di
f
fstat
-
with-grap
h
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Mer
g
e
bra
n
ch 'zj/mksh-co
l
umns-breaka
g
e'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merg
e
b
r
anch 'jk/doc
-
a
scii
d
o
c-inli
n
e-literal'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge branch 'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
H
aman
o
Merge
branch
'
mm
/
s
i
mple-push'
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge bra
n
ch 'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
gi
t
-svn: int
r
od
u
ce SVN
v
ersion compariso
n
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C Haman
o
Merge
bran
c
h 'master' of https:
/
/github
.
com/git-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Sync
w
ith v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
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
m
a
no
Me
r
ge
bra
n
ch 'pw/f
a
st-import
-
da
t
aref-parsing' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merg
e
branch 'it/f
e
t
c
h-pack-many-refs' into main
t
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merg
e
bran
c
h 'jl/maint-submodule-re
c
urse-fetch' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge branch
'
jc/main
t
-b
l
am
e
-
minimal' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'lp/ma
i
n
t-dif
f
-thre
e
-d
a
s
h
-
w
i
t
h-
g
raph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Ham
a
no
Merge b
r
anch 'jk/
r
e
base-i-submod
u
le-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
a
mano
Merge branch 'm
a
int' of https://github
.
c
o
m
/
g
it-l1
0
n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio C Haman
o
log-tre
e
: the previous one is stil
l
not quite right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C H
a
mano
Merge branch 'ld/g
i
t-p4-
t
ags-an
d
-labels'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
H
aman
o
Mer
g
e bra
n
ch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
M
e
rge
b
ran
c
h 'jk/maint-c
o
nf
i
g-bogus-sec
t
ion'
commit
|
commitdiff
|
tree
2012-04-30
J
unio
C Hamano
contrib
/
rer
e
re-train:
use i
n
stalled git-sh
-
setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Th
e
seventh batch of topics
g
raduated to 'mast
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C
H
amano
M
e
rge bra
n
ch 'js/daemon-test-race
-
fix'
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Ham
a
no
Merge bran
c
h 'kk/gitw
e
b
-omit-expe
n
si
v
e'
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Hamano
Me
r
g
e branch '
k
k/main
t
-git
w
eb-missing-owner'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge branch
'rs/c
o
m
m
it-list-append'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
branch 'mm/include-u
s
erp
a
th'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
M
erg
e
b
r
a
n
ch '
p
w/t
5
800
-
im
p
or
t
-race-fi
x
'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
Merge
b
r
a
nch 'jk/
r
e
pack-no-expl
o
de-
o
bje
c
ts-from-
o
ld
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
J
unio
C Haman
o
M
e
rge git
:
//git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio C
Haman
o
index-v4: document the entr
y
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ha
m
a
n
o
unpack-tree
s
: p
r
ese
r
ve the index file versio
n
o
f
original
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C
H
amano
The sixth batch of topics gr
a
d
u
a
ted to
'
ma
s
te
r
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge
b
ranch 'jc/merge-reduce-parents-
e
arly'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Junio
C H
a
ma
n
o
Merg
e
b
ranc
h
'js/fast
-
i
mpo
r
t-test-9300'
commit
|
commitdiff
|
tree
2012-04-27
J
unio C Hamano
Merge br
a
n
c
h 'rt/cherry-revert-conflict-summary'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge branch 'cb/
m
aint-r
e
port-mount-point-c
o
rrectly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
i
o
C Hamano
Merge bran
c
h 'cb/cherry-pick-rev-path-confusion'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge branch 'cb/http-mul
t
i-curl-auth
'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge branc
h
'
z
j
/
mksh-columns-breakage'
into lp/di
f
fstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
U
pdate draft release no
t
es to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
rge branch 'rl/ma
i
nt-stash-i18
n
-save-error'
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C H
a
m
a
no
M
erg
e
b
ranch
'
m
b
/
fetch-c
a
ll-a-n
o
n-
b
ranc
h
-a-ref
'
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
H
amano
Merg
e
b
ranch '
j
m/maint-
s
trn
c
py-diff-no-index'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge bundle error messa
g
e fix
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C
H
amano
Sta
r
t
p
r
e
p
aring
for 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Merge branch
'jk/run-command-e
a
cces' i
n
to maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
ni
o
C Hamano
Mer
g
e branch 'jc/push-upstream-sanit
y
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Me
r
ge branch 'jc/
m
aint-clean
-
nested-worktree-in-subd
i
r
.
.
.
commit
|
commitdiff
|
tree
next