repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/makefile-cleanup'
2012-07-16
Junio C Hama
n
o
Merge bran
c
h 'jn/makefile-cle
a
n
up'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge
b
ranch 'ar/clone-
h
onor-u
m
ask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
M
erge bran
c
h 'jc/ap
p
ly-3w
a
y'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
branch '
p
w/g
i
t
-
p
4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'p
w
/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
io C Hamano
Merge
bran
c
h 'jk/push-de
l
ete-ref-err
o
r-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixth
ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
M
erge
b
r
anc
h
'jc/refactor-dif
f
-s
t
di
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge br
a
nch 'tg/
c
e-namelen
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merg
e
bran
c
h 'tb/saniti
z
e-deco
m
pos
e
d
-
u
t
f-8-pat
h
name'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
amano
Merge branch 'mm/med
i
awiki-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bran
c
h 'jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C
H
amano
Merge bra
n
ch 'mm
/
m
ediaw
i
ki-fil
e
-attachm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
H
a
mano
Merge branch
'tr/maint-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
M
erge b
r
anch 'mz/reb
a
se-no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
R
educe draft re
l
e
ase notes to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync
w
ith 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Mer
g
e
branch 'jc/
m
aint-blame-uniq
u
e-abb
r
ev' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'
rj/plat
f
orm-pread
-
m
a
y-be-
t
hread-uns
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge bran
c
h 'th/d
i
ff-no-index-fixe
s
' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
bran
c
h
'nd
/
c
lone-
s
ingle-fi
x
' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'jc/rev-list-si
m
p
lif
y
-mer
g
es-fir
s
t-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
mano
M
e
r
ge branc
h
'hv/submodule-update-
n
uke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Merge branch '
j
k
/
diff-
n
o
-ind
e
x-pa
g
e
r
' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge
b
ranch 'mm/verify
-
file
n
ame-fix' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'cn/cherry-pick-
r
ange-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Me
r
ge br
a
nch '
j
c/us
t
ar-checks
u
m-is-unsigned' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc
/
bundle
-
complete-notice' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Me
r
g
e bra
n
ch 'jc/ls-fi
l
e
s
-
i-d
i
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Me
r
ge
b
ranch 'jc/request-pull
-
match-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Hama
n
o
apply: test
s
for th
e
--3
w
a
y
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rer
e
re:
mak
e
r
r
-
c
a
che f
a
nou
t
dir
e
ctory
honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply: docume
n
t --
3
w
ay option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
ppl
y
: allow rerere() to work
o
n --3way
re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
apply
:
re
g
i
s
ter conflicted
stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: --3way w
i
th add/
a
dd conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mo
v
e
ve
r
ify_
i
ndex_ma
t
ch() h
i
gher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: pl
u
g
the three-w
a
y
m
e
r
ge logic
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hama
n
o
a
pp
l
y: f
a
ll
back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
apply: accept -3/
-
-3
w
ay
c
ommand lin
e
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
n
o
apply: mov
e
"
already ex
i
s
t
s
" lo
g
ic
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
pply: move c
h
eck_
t
o_c
r
eate_blob() closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: furth
e
r
split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor
"
p
r
e
v
ious
p
a
tch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hama
n
o
apply: split load_p
r
eimage
(
)
h
elpe
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: factor o
u
t checkou
t
_ta
r
get() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
r
e
fact
o
r re
a
d_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Haman
o
a
pply: clear_im
a
ge() cl
e
ars thi
n
gs a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
am
a
no
a
p
ply: a bit more com
m
en
t
s
o
n PATH_T
O
_B
E
_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
apply:
f
i
x
an incomplete comment i
n
check_pa
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e git://gith
u
b
.
c
om/git-l10n/git-p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
F
ifth batch
f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
M
erge
branch 'cw
/
h
elp-over-netwo
r
k'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branch
'mz
/
e
m
pty-re
b
ase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
an
o
M
erge branch 'pw/git-p
4
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
Merge branch 'js/fast-export-paths-wi
t
h
-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e br
a
n
ch
'
c
w/no-detachi
n
g-a
n
-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'vr
/
us
e
-our-perl
-
i
n-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch '
m
m/credential
-
plumb
i
ng'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
Merge branch
'
jc/maint-blame-u
n
i
que
-
abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
ge
branch
'jn/perl
-
makemaker
-
l
eading
-
p
a
ths'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Mer
g
e branch 'rj/platform-pread-may-be-
t
hread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
Merge branch
'mm/co
n
f
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
i
o C Hamano
Fourth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Ham
a
no
Merge branch
'
nd/clone-single
-
fix'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C H
a
mano
M
erge bra
n
ch 'th/
d
iff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C
Hamano
Merge b
r
a
n
ch 'hv/remote-end-hu
n
g-up'
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Hamano
Sync w
i
th
i18n-po u
p
da
t
e
s in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Merge
branch 'm
a
int' of git://
g
ithub
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
unio C
Hamano
blame: comp
u
te abbreviation wi
d
th that ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
i
ff-index
.
c:
"
g
it
d
iff" has no nee
d
to re
a
d
b
l
o
b
f
r
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C Hamano
diff-index
.
c: un
i
fy ha
n
dling
o
f command lin
e
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C H
a
m
a
n
o
diff-index
.
c
:
d
o not preten
d
paths are p
a
thspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third bat
c
h
f
or 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
M
e
rge branch 'fc/g
i
t-
p
rompt-scri
p
t'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ha
m
ano
M
erge branch 'js/su
b
modul
e
-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Me
r
ge branc
h
'lk/more-
h
elpful-st
a
tus-hint
s
'
commit
|
commitdiff
|
tree
2012-06-28
J
uni
o
C Hamano
Merg
e
b
r
anc
h
'lk/rebase-i-x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge branc
h
'jc/rev-l
i
st-simplify-merges-f
i
rst-paren
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Mer
g
e
branch 'hv
/
s
u
bmodul
e
-u
p
date-
n
uke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ha
m
ano
Merge branch 'nd/
e
x
c
l
ude-work
a
roun
d
-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e branc
h
'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io C Ham
a
no
M
erge branch 'n
d
/stream-in
d
ex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
M
e
rge
b
r
anch 'm
m
/verify-filena
m
e-
f
i
x
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge br
a
n
ch
'jk/
d
i
ff-no-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio
C
H
a
mano
i
n
d
e
x-
p
a
c
k: Disab
l
e threa
d
ing on cy
g
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
un
i
o
C Ham
a
no
Second batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
M
erge
branch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C Haman
o
Merge
b
ranch
'cn/cherry-pick-range-do
c
s'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
br
a
nch 'lm
/
git-
b
lame-el'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
Merge
branch 'rs/ipv6-ss
h
-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
anch 'jc/ustar-checksum-is-u
n
si
g
ned'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio
C Hamano
Merge branch 'rs/g
i
t
-
blame-mapcar-ma
p
c'
commit
|
commitdiff
|
tree
2012-06-25
J
u
ni
o
C Hamano
M
e
r
g
e
b
r
a
nch 'rr
/
doc-commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
g
e
branch 'nd/i18
n
-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'nd/i18n
-
br
a
n
c
h-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'jk
/
no-more-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
man
o
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
next