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: --3way with add/add conflict
2012-07-09
Junio C Hamano
a
pply: --3way
with
a
dd/add co
n
f
l
i
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
a
p
ply: mov
e
v
e
rif
y
_i
n
dex_match() h
i
gher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
plug the th
r
ee
-
way
merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
a
p
ply: fall
b
ack on three
-
way
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C H
a
mano
apply: ac
c
ept -
3
/--
3
way co
m
man
d
line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: move "a
l
ready exists" l
o
gic to check
_
to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: mo
v
e check_t
o
_c
r
eat
e
_blob()
c
loser to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
appl
y
:
f
urth
e
r
s
p
lit
load_prei
m
a
ge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
app
l
y:
r
efactor "previous
p
atch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
apply
:
s
p
lit
load_preimage
(
)
h
elp
e
r
functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply
:
fa
c
t
or out
c
h
e
ckout_tar
g
et() hel
p
e
r
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: refactor read
_
file
_
or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
apply: clear_image
(
) clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
pl
y
: a
b
i
t more
c
o
m
m
ents
o
n
PA
T
H_T
O
_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
app
l
y
:
fix an incomplete comment
in chec
k
_patc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C H
a
mano
T
he nint
h
batch o
f
topi
c
s gr
a
duate
d
t
o 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Hamano
Merge b
r
anch 'nh
/
empty-reba
s
e'
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Me
r
ge branch 'zj/
d
iff
-
empty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Hama
n
o
Merge branch 'jk/maint-tforma
t
-wit
h
-z'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
i
o C Hamano
M
e
rge branch 'th/difft
o
ol-diffall'
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
i
o
C Hama
n
o
Sync
w
ith main
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
St
a
rt preparing for
1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Hamano
Merge branch 'jk/maint-gitweb-test-
u
se-s
a
ne-per
l
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Ha
m
ano
M
erge branch 'j
s
/daem
o
n-te
s
t-race-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Merge branch 'jk/ma
i
nt
-
config
-
bogus-section' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio
C
Ham
a
no
Merge b
r
anch 'pw
/
t5800-im
p
or
t
-
r
ace-fix
'
int
o
maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
Merg
e
b
r
anch
'rt/
c
herry-revert-conf
l
i
c
t
-summar
y
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hama
n
o
Merge
b
ranc
h
'cb/maint-report-mount-point-correc
t
ly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C H
a
mano
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge branch 'jc
/
mer
g
e-r
e
duce-pa
r
ents-early' in
t
o maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e bra
n
c
h
'
c
b/ch
e
rry-pick-re
v
-
path
-
confusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Merge
b
ranch
'cb/http-multi-curl-aut
h
' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Mer
g
e bran
c
h 'mb/fetch-call-a-non-
b
ranch
-
a-ref
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C
H
amano
Mer
g
e
branch '
r
l/
m
ain
t
-sta
s
h-i18n
-
save-error' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
ano
Merge branch 'jm/ma
i
nt-s
t
rncpy-diff-no-ind
e
x' int
o
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
a
mano
M
erge branch 'j
k
/maint-
p
u
sh-p
r
ogr
e
s
s'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
a
m
a
n
o
Merge bra
n
ch 'nd/col
u
m
n
s
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
m
a
no
The eighth
b
a
t
ch of topics gradua
t
ed to
'
ma
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge br
a
nch 'master' of g
i
t://
g
i
t
.
b
ogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
Haman
o
M
erge
branch 'tr/xdiff-fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Ha
m
ano
M
erge bran
c
h 'j
k
/maint-gitweb-test-use-s
a
ne-pe
r
l'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
M
erge b
r
a
n
ch 'pw/mess
a
g
e
-cleanup'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge branch 'zj/diff-stat-smaller-num-
c
o
lum
n
s'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch
'pw/p4-va
r
ious'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
aman
o
M
erge branch 'jc/rere
r
e
-
tra
i
n'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merg
e
branch 'ab
/
i18n'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C
H
amano
M
erge
b
ranch 'lp/dif
f
s
ta
t
-with-gr
a
ph'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
H
amano
Merge b
r
anch 'zj/mksh-
c
olumns-breakage'
commit
|
commitdiff
|
tree
2012-05-02
J
uni
o
C
H
am
a
no
Merge bran
c
h
'jk/doc
-
a
sciidoc-i
n
line-literal'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merg
e
branch 'nd/i1
8
n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branc
h
'mm/simple-
p
ush'
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C
H
amano
Merge branch 'jc/index-
v
4
'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
git-svn: introduce SVN versi
o
n comparison func
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch 'master' of https://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Sync wit
h
v
1
.
7
.
1
0
.
1
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hama
n
o
G
it 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
er
g
e
branch 'pw/fast-imp
o
rt
-
da
t
aref-par
s
in
g
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hama
n
o
Merge branch 'it
/
fet
c
h-pa
c
k-many
-
refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Haman
o
Merge branch 'jl/maint-submod
u
le-re
c
urse-
f
etch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge bra
n
ch 'jc/maint-blam
e
-min
i
m
a
l'
i
n
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C
Hamano
Merge branch 'lp/maint-
d
if
f
-three-d
a
sh-wit
h
-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Ham
a
no
M
er
g
e
b
ranch 'jk/rebase-i-submodu
l
e-confli
c
t
-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge
b
ranch 'main
t
' of
h
tt
p
s://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
J
u
n
io C Hamano
log-tree
:
t
h
e pre
v
ious
o
ne is sti
l
l not
q
u
ite
r
igh
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C
H
aman
o
Merge
b
ranch 'ld/gi
t
-p
4
-tags-
a
nd-label
s
'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
Merge b
r
anch 'nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Hamano
Merge branch
'jk/maint-c
o
n
f
ig-bogus-section'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
c
o
ntrib/rerere-train: use
installed gi
t
-sh-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio C Ha
m
ano
The seventh
b
a
tch
o
f topics graduated
t
o 'master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Junio
C Hamano
Merge b
r
a
n
ch 'js/d
a
emon-test-rac
e
-fix'
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C
H
a
mano
M
e
rge branch '
k
k/g
i
tweb
-
o
mit-e
x
pen
s
ive'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge
b
r
a
nch 'kk/maint-gitweb-m
i
ssing-owner'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C Ha
m
a
no
Merge branch 'r
s
/commit-list-append'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge
branch '
m
m
/
include-userpath'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C Ha
m
an
o
Merge branch 'p
w
/
t5800
-
import-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Me
r
ge b
r
anch 'jk/repa
c
k
-
no-explode-objects-from-old
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
J
u
n
i
o
C
Hamano
Me
r
ge g
i
t://git
.
bogomips
.
o
rg/
g
it-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hama
n
o
index-v4: doc
u
men
t
th
e
entr
y
f
o
r
m
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
J
u
n
i
o C Hamano
unpack-trees: pre
s
erve
the index file vers
i
on
of
o
r
iginal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
The sixth b
a
t
ch of to
p
ics graduat
e
d
t
o
'mast
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C
H
am
a
no
Me
r
ge branch '
j
c/me
r
g
e-reduce-parent
s
-early'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Merge bra
n
c
h
'
j
s/fast-impo
r
t
-
test-930
0
'
commit
|
commitdiff
|
tree
2012-04-27
Junio
C H
a
mano
Merge
branch
'rt/che
r
ry-revert-
c
o
n
flict-summary'
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hamano
Merge branc
h
'cb/maint-report-mou
n
t-point-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ha
m
ano
Merge b
r
anch 'cb
/
ch
e
rry-p
i
ck-rev-path-con
f
u
s
i
on'
commit
|
commitdiff
|
tree
2012-04-27
Junio
C Hamano
Merge
bra
n
ch
'c
b
/h
t
tp-multi-curl-auth'
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C
Hamano
Merg
e
branch 'zj
/
mksh-colu
m
ns-bre
a
kage' into lp
/
d
i
ffstat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Update draft relea
s
e note
s
to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
mano
Merge branch
'
rl/ma
i
n
t-sta
s
h-i18n-save-error'
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hamano
M
e
r
ge branch 'mb/f
e
tch-call-a
-
non
-
branch-a-ref'
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Ham
a
no
Mer
g
e branch 'jm/m
a
int-st
r
ncpy-dif
f
-no-index'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge bund
l
e
error message fix in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
m
a
no
Start preparing for 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
M
erge
branch '
j
k
/
run-command-eacces' into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Merge branch 'jc/push-up
s
tream-sanity' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch '
j
c/maint
-
clean-nested-
w
orktree-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
rge branch
'
j
k/
d
if
f
-
n
o-rename-
e
mpty' int
o
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Merge br
a
n
c
h 'rs/
c
ombine-dif
f
-zero-con
t
e
xt-a
t
-
th
e
-begin
n
ing
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C
Hamano
Merge branch 'jc/commit-u
n
edited-temp
l
ate
'
into maint
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
m
a
n
o
Merge bra
n
ch 'jk
/
add-
p
-skip-c
o
nflicts' into maint
commit
|
commitdiff
|
tree
next