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: document --3way option
2012-07-09
Junio C Hamano
apply: document --3way
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply
:
a
l
low rerere() to work
o
n --3
w
ay results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
ap
p
ly: regist
e
r conflicte
d
stages to the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
app
l
y: --3way
w
ith add/
a
dd conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: move
verify_
i
n
d
e
x_match() highe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
appl
y
: plug the thre
e
-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
apply:
f
all back on thr
e
e
-
way
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
a
pply:
a
ccept -3/-
-
3
way com
m
a
nd line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: mov
e
"already exists" lo
g
ic to c
h
eck_to_cr
e
ate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: move ch
e
ck_to
_
create_bl
o
b() cl
o
ser to
i
t
s sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: further
s
plit load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Haman
o
a
p
p
ly
:
ref
a
c
tor "pre
v
ious pa
t
ch"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
apply: split load_preimag
e
() helpe
r
fun
c
t
ion
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
factor out
c
h
e
ckout_target(
)
helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refa
c
tor read_file_or_git
l
ink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
p
ply: clea
r
_image() clears
t
hings a bit mor
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: a bit m
o
re com
m
ents on P
A
TH_TO_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
fix an
i
ncomp
l
ete com
m
ent in check_
p
atch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
The ninth
b
atch of topics grad
u
ated to 'm
a
ster'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Me
r
g
e
b
ranch
'
nh/empty-rebase'
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Hamano
Merge
branch '
z
j
/
diff-emp
t
y-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merge branch 'jk/m
a
int-tformat
-
wi
t
h-z
'
By Jan Krüger (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merg
e
branch 'th/
d
ifftool-diffal
l
'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C H
a
ma
n
o
Sync with mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Ham
a
no
S
tart preparing for 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C
H
a
m
ano
Me
r
ge
b
r
anch 'jk/mai
n
t
-
gitweb-test-u
s
e-
s
ane-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
M
erge bra
n
ch
'
js/daemon-t
e
st-r
a
c
e
-
f
i
x' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
m
a
n
o
Merge branch 'jk/maint-config-
b
ogus-s
e
c
ti
o
n' into maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io
C Hamano
Me
r
g
e branch 'pw/t5800-im
p
ort-r
a
ce-fix
'
into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hama
n
o
Merge branch 'rt/c
h
er
r
y-revert-conflict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch
'
cb/maint-report-mount-poi
n
t
-
correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio
C
H
a
man
o
Merge
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Me
r
ge branc
h
'
j
c
/
me
r
ge-reduce-pare
n
t
s-early' into maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ham
a
no
Merge branch
'cb/c
h
e
rry-
p
i
c
k-r
e
v-path
-
confusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
ni
o
C Hamano
Merge
branch 'cb/http-multi-curl-auth' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge bran
c
h 'mb/fetch-call
-
a-non-
b
r
a
n
c
h
-a-ref' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge
b
ranch '
r
l/maint
-
stash-
i
18n-save-err
o
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C H
a
m
a
no
Merge branch
'j
m
/maint-strncpy-d
i
f
f
-
no-index' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
an
o
Merge branch 'jk/
m
aint-push-pro
g
ress'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
erge br
a
nch 'nd/
c
olum
n
s'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
The
eighth batch of to
p
ics gradu
a
ted
to 'ma
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'ma
s
ter'
o
f git:
/
/git
.
bo
g
omips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Ham
a
no
M
e
rge branch 'tr/
x
d
iff
-
fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C H
a
mano
Merge branch 'jk/main
t
-g
i
tweb-t
e
st-use-san
e
-perl'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merg
e
bra
n
ch 'pw/mes
s
age-
c
le
a
n
u
p'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o C Hamano
Merge
b
r
anch
'zj/diff-s
t
a
t-smal
l
er-n
u
m-colu
m
ns'
commit
|
commitdiff
|
tree
2012-05-02
J
u
ni
o
C
Hamano
Me
r
ge branch 'pw/p4-v
a
rious'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge branch '
j
c
/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
e
rge b
r
anch
'
a
b
/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge
b
ranch 'lp/d
i
ffs
t
at-wi
t
h
-
gr
a
ph'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
zj/mksh-colum
n
s-breakage
'
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
M
e
rg
e
branch 'jk/d
o
c-
a
sciidoc-inline-literal'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branc
h
'nd/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch '
m
m/simpl
e
-push'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge b
r
a
nch
'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
m
a
no
git-svn: introd
u
c
e S
V
N version comparison fun
c
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merge
b
ranch
'
mast
e
r' of
h
t
t
p
s://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Sync with
v
1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio
C Hamano
G
i
t 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'pw/fa
s
t-
i
mport-dataref-
p
arsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
unio C H
a
mano
Merge branch
'
i
t/fetch
-
pack-many-refs' into ma
i
nt
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Me
r
ge bran
c
h 'jl/m
a
int
-
submodule-recurse-fetch' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Merge branch 'jc/maint-blame-minima
l
'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-02
Junio
C
Hamano
Merge branch 'lp
/
maint-dif
f
-thr
e
e-dash-with-graph
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C
H
aman
o
Me
r
ge bra
n
ch 'jk/re
b
as
e
-i-submod
u
le-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
M
erge branc
h
'
m
aint' of https://g
i
th
u
b
.
com
/
git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Junio C Ha
m
ano
log-tree
:
the previous o
n
e
is still not quit
e
rig
h
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o
C Hamano
Merge branch 'l
d
/git-p4-ta
g
s-and
-
labels'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Haman
o
Me
r
ge branch 'nh/
e
mpty
-
r
e
base'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Haman
o
Merge branch 'jk/maint-
c
onfig-bogus-sect
i
on'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
cont
r
ib/rer
e
re-train: use installed
g
i
t-sh-
s
etu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio
C Hamano
The seventh batch of
t
opics graduated to
'mas
t
er'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
J
u
ni
o
C Hamano
Mer
g
e bra
n
c
h 'js/daemon-te
s
t-ra
c
e-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
b
ranch 'k
k
/gitwe
b
-omit-expens
i
ve'
commit
|
commitdiff
|
tree
2012-04-30
J
unio C
H
amano
Merge branch
'
k
k
/
maint-gitweb-miss
i
ng-owner'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge
branch 'r
s
/c
o
mmit-list-append
'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C Ham
a
no
Merge branch '
m
m
/include-userpath'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merg
e
branc
h
'
p
w/t5800-imp
o
rt-race-fix'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
M
erge branch '
j
k/
r
epack-n
o
-explode-objects-from-o
l
d
.
.
.
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merg
e
g
it://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ham
a
no
index-v4: do
c
ument t
h
e e
n
try format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Jun
i
o C Ha
m
ano
unpack-tr
e
es: pre
s
erve
t
h
e index file versio
n
of orig
i
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C Haman
o
T
h
e
sixth
b
a
tch of to
p
ic
s
graduated to '
m
ast
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Jun
i
o
C
Hamano
Mer
g
e branc
h
'jc
/
m
e
r
ge-reduce-parents-ea
r
ly'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Juni
o
C Hamano
M
e
r
ge branch '
j
s/
f
a
st-import-test-9300'
commit
|
commitdiff
|
tree
2012-04-27
J
unio C Hamano
Merge
bran
c
h 'rt/cherry-revert-conflict-summary'
commit
|
commitdiff
|
tree
2012-04-27
Ju
n
io C Hamano
M
e
rge branch '
c
b/maint-repor
t
-mount-point-
c
orrectly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Junio
C Hamano
Merge branch 'cb/cherry-pic
k
-rev-path-confusio
n
'
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
Hamano
Me
r
ge
bra
n
ch 'cb/http-m
u
lti-curl-auth'
commit
|
commitdiff
|
tree
2012-04-27
J
un
i
o C H
a
mano
M
erge bra
n
ch
'
zj/mksh-columns
-
breakage' into
lp/diff
s
tat
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Ham
a
no
U
p
d
a
t
e
draft release note
s
to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
ama
n
o
Me
r
ge branch
'rl/maint-
s
tash-i
1
8n-save-error'
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Merge branch 'mb/fetch
-
call-a-non-branch-a-ref'
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
rge br
a
nch 'jm/maint-str
n
cpy-diff-
n
o-index'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C
H
amano
Merge bundle error me
s
s
a
ge
f
i
x in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Start
p
r
e
pari
n
g for 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge
bran
c
h 'jk/
r
un-
c
o
m
mand-eacc
e
s' i
n
t
o maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C H
a
mano
Merge br
a
n
ch 'jc/push-upstream-
s
anity
'
into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Merg
e
b
r
anch 'jc/maint-clean-nested-wo
r
k
tr
e
e-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge b
r
anch '
j
k
/
d
iff-no-rename-
e
mpty' into maint
commit
|
commitdiff
|
tree
next