repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Jun
i
o
C Hamano
Merge
b
ranch 'jk/ma
i
nt-commit-amend-only-no-paths
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hama
n
o
Merge br
a
nch 'cw/amend-commit-
w
it
h
out-
m
essag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge bra
n
ch 'j
n
/makefil
e
-cl
e
anup'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o
C Hamano
Me
r
ge br
a
nch
'
a
r
/clon
e
-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C
Hamano
Merge branch '
j
c/apply-3
w
ay'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Mer
g
e b
r
an
c
h 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge
b
ranch 'pw/git-
p
4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C Hamano
Merge branch 'pw/git-p4-
j
obs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge bran
c
h 'jk/push-
d
e
l
ete-ref-error
-
m
e
ssag
e
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixth
bat
c
h for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C Hamano
Me
r
ge bra
n
c
h 'jc/re
f
actor-diff-st
d
in'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
amano
Merge br
a
nch 't
g
/
c
e
-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Ha
m
a
n
o
M
erge bra
n
ch 'tb/saniti
z
e-d
e
co
m
pose
d
-u
t
f
-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
er
g
e
bra
n
ch 'mm/me
d
iawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
m
ano
Merge
br
a
nch 'jn
/
vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch 'mm
/
medi
a
wiki-fi
l
e-att
a
chments'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Hamano
Mer
g
e bra
n
ch
'
tr/main
t
-sho
w
-
walk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hama
n
o
Merge branch
'
mz/rebase-
n
o-mb
o
x
'
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
aman
o
Reduce
d
raft rele
a
se
n
otes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
no
S
y
nc with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
no
Merge b
r
an
c
h 'jc
/
mai
n
t-blame-unique-abbr
e
v
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branch
'r
j
/
platform-pre
a
d-may-b
e
-thread
-
unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Hamano
Merge
b
r
anch 'th/d
i
ff-
n
o
-
index-fi
x
es' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Mer
g
e
branch
'nd/clone-si
n
gle-fix' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
r
ge branch 'jc/rev-list
-
simplify-me
r
ges-first
-
pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ha
m
ano
Merge br
a
nch
'
hv/s
u
bmod
u
le-update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ha
m
ano
Merge
b
ranch 'jk/diff-no-index-p
a
ger' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C H
a
mano
M
e
rge branch 'mm/veri
f
y-filename-fix'
i
nto main
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
ano
Merge
b
ranch
'
cn/cherry-pic
k
-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Haman
o
Merge
b
ranch 'jc/u
s
tar-checksum-i
s
-
u
ns
i
gned' in
t
o main
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'jc/bun
d
l
e
-complete-notice'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Me
r
ge branc
h
'jc/ls-files
-
i-d
i
r' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/request-pull-match-ta
g
name' into main
t
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Ham
a
no
apply:
t
e
sts for
t
he --3
w
ay
o
pt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
n
o
rer
e
r
e: make rr-ca
c
he fanout di
r
ectory honor u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
ap
p
ly:
document --3w
a
y optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
n
o
apply:
a
llow rere
r
e()
to work on --3way resul
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
apply: register conflicted sta
g
es
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: --3
w
ay with ad
d
/add conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
ap
p
l
y
:
m
o
v
e
v
e
r
ify_index_m
a
tch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
app
l
y:
p
lug the th
r
ee-way m
e
rge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
app
l
y: fall back on
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
ccept
-3/--3way command l
i
ne option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
ap
p
l
y
: mov
e
"already
exist
s
" logic to check_to_create
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
a
p
pl
y
:
move chec
k
_to_create_blob() clos
e
r
to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
app
l
y
:
f
urthe
r
split l
o
ad_pr
e
image()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: ref
a
ctor
"p
r
evious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: split loa
d
_preimage() help
e
r
fu
n
c
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
ap
p
ly: f
a
ct
o
r out
c
heckout_
t
a
r
get
(
) helper fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: re
f
actor re
a
d_file_o
r
_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() clears things
a b
i
t mor
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
a
p
ply: a bit more co
m
me
n
ts on P
A
TH_TO_BE_
D
EL
E
TED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: fix a
n
incomplete comm
e
nt in
c
he
c
k_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge
g
it://git
h
ub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Fifth b
a
tch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
Merg
e
branch 'cw/help-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ham
a
no
Merge
branch 'mz/e
m
pty-
r
ebase-t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge b
r
anch 'pw/git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
Merge branc
h
'js/fast-export-paths-with-sp
a
ces
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hama
n
o
M
e
r
g
e
branch 'cw/no-detaching-an-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Me
r
ge branch 'mm/credentia
l
-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
aman
o
Merge branch '
j
c/maint-blame-unique-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'jn/perl-make
m
aker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'rj/platform-pread-may-be-thread-
u
nsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge br
a
nch 'mm/config-xdg
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
F
ourth ba
t
ch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
e
rge
br
a
nch '
n
d
/
clon
e
-si
n
gle-f
i
x'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
b
ranch 'th/
d
iff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Haman
o
Merge branch 'hv/re
m
ote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sy
n
c
w
i
th i18n-po
upda
t
e
s in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
H
a
mano
Merge branch 'maint' of
g
i
t
://github
.
com/
g
i
t
-
l
1
0
n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
bl
a
m
e: compute abbrevi
a
tio
n
width
that
ensur
e
s unique
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hama
n
o
diff-inde
x
.
c
:
"g
i
t diff" has no need to read blo
b
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
d
i
f
f-index
.
c: unif
y
ha
n
dlin
g
o
f
c
o
mma
n
d line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C H
a
mano
diff-index
.
c: do not pretend
p
aths ar
e
pathsp
e
cs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Third batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
ni
o
C Hamano
Merge bra
n
ch 'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
am
a
n
o
Merge branch 'j
s
/s
u
bmodul
e
-
relati
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge bra
n
ch 'lk/more-helpf
u
l-status-
h
ints'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge branch 'l
k
/rebase-i-
x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e
b
ran
c
h 'jc/rev-list-simpli
f
y
-
mer
g
es-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Hamano
Merg
e
branch
'
hv
/
submodule-
u
pdate-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch
'n
d
/ex
c
lud
e
-worka
r
ound
-
top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
Hamano
Merg
e
branc
h
'nd/stream-pack-obje
c
ts'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge bran
c
h
'nd
/
stream-index-p
a
ck'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge branch 'mm/verify-filena
m
e-fi
x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge branch 'j
k
/di
f
f-no
-
i
ndex-p
a
ger'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Ham
a
no
index
-
pack: Disa
b
le threading on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
S
e
cond ba
t
ch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
Merge branc
h
'lp/
n
o-
c
md-http
-
fetch
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io
C
Hamano
Merge br
a
n
c
h '
c
n/cherry-pic
k
-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Me
r
ge
branch 'lm/git-blam
e
-el'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Ha
m
ano
Merge branch '
r
s
/
i
pv6-
s
sh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e branch 'jc/
u
s
t
ar-checks
u
m
-is-u
n
signed'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
Merge branc
h
'rs/git-b
l
ame-mapcar-
m
apc'
commit
|
commitdiff
|
tree
2012-06-25
J
uni
o
C H
a
m
a
no
Mer
g
e branch 'rr/d
o
c-comm
i
t'
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
i
o C Hamano
Merge branch 'nd/
i
1
8n-mis
c
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
branch
'
nd/i1
8
n-branch-lego'
commit
|
commitdiff
|
tree
next