repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 1.7.11.3
2012-07-22
Jun
i
o
C Hama
n
o
Sy
n
c wit
h
1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
G
it 1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C H
a
m
ano
Me
r
g
e
branch 'jk/p
u
sh-d
e
lete-
r
ef
-
error-
m
e
s
sa
g
e' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o
C
Hamano
Merge branch 'ar/clone-honor-umas
k
-at
-
top' into m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'cw
/
amend-commit-
w
ithout-message' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Ham
a
n
o
M
e
r
ge
b
ranch 'j
k
/m
a
i
n
t-
c
ommit-am
e
nd-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge b
r
a
n
ch 'tg
/
maint
-
cache-na
m
e
-compar
e
' into
m
aint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge bra
n
ch 'tr/
m
aint-show-wa
l
k
' int
o
m
aint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
M
e
r
g
e branch
'j
c
/refactor-diff-st
d
in' into maint
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Mer
g
e branch 'mz/empty-rebase-test' int
o
maint
commit
|
commitdiff
|
tree
2012-07-22
J
unio C H
a
ma
n
o
Merge branc
h
'j
s
/fast-e
x
p
ort-paths-with-spaces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge b
r
anch 'cw/no-
d
etaching-an-unborn' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'vr/us
e
-our-perl-in-tests' into maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
Hama
n
o
M
e
rge gi
t
://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/re
v
ision-walk-stop-at-max-coun
t
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge branch 'm
m
/config
-
xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
M
erge branch
'as/
t
4
0
1
2-sty
l
e-updates'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o
C Ham
a
no
Merge bran
c
h 'pg/maint-1
.
7
.
9-am-where-
i
s-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Mer
g
e branch 'jl/main
t
-1
.
7
.
10-rec
u
rse-
s
ub
m
o
d
u
le
s
-
with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Haman
o
Me
r
ge br
a
nch '
m
s/daemon-doc-
t
ypo'
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o C
H
amano
M
erg
e
branch 'lk/more-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge branc
h
'j
c
/sha
1
-name-more'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
M
erge branch '
j
c/main
t
-
f
ilter-bran
c
h-e
p
och-date'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Update draft releas
e
notes for 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ha
m
ano
Me
r
g
e
branch 'tg/maint-cache-name-
c
ompare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
M
erge
b
r
a
nch 'jk/index-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
m
ano
M
e
rg
e
branch
'jk/m
a
int-co
m
mit-amend-o
n
ly-
n
o-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
bran
c
h 'cw/amend-commit-wi
t
hout-message'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branc
h
'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Mer
g
e branch 'ar/clo
n
e-honor-umask-at
-
top'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Ham
a
no
Merge b
r
anch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o C H
a
mano
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch '
p
w/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hama
n
o
M
erge bran
c
h 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Mer
g
e
b
ra
n
c
h 'j
k
/
p
ush-dele
t
e-re
f
-error-mes
s
age'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Sixth batc
h
f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ha
m
ano
Merge b
r
anch 'jc/
r
efa
c
tor-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch
'
t
g/ce
-
namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C
H
a
m
ano
Merge branch 'tb/sanitize-
d
e
c
om
p
osed-utf
-
8-pa
t
hname'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Hamano
Merge
b
r
anc
h
'mm/mediaw
i
k
i
-tests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hama
n
o
Merge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hama
n
o
Merge branch 'mm
/
mediawik
i
-file
-
attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'tr/mai
n
t-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
M
e
rge bran
c
h 'mz
/
reba
s
e
-no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
no
t151
2
:
ma
t
ch the "other" object na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7
0
03: add test to filter a b
r
anch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Juni
o
C H
a
m
a
n
o
date
.
c
:
Fi
x
off by
one error in o
b
j
e
ct-heade
r
d
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t
1
512
:
ignore whitespaces i
n
wc -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Reduce draf
t
release not
e
s t
o
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sy
n
c with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
amano
Git
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
n
o
Me
r
ge bran
c
h 'jc/maint-blame-unique
-
abbrev' into
m
ain
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge br
a
nc
h
'rj/platfo
r
m-prea
d
-m
a
y-
b
e-
t
hread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
H
a
m
ano
Merge
branch 'th/di
f
f-no-inde
x
-fixes' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Me
r
ge branc
h
'nd/clo
n
e-single-fix'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/rev-list-sim
p
lify-merge
s
-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge
b
ranch 'hv
/
submodule-update-nuke-s
u
bmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
M
e
rge branch
'
j
k/d
i
ff-no-i
n
d
e
x
-pager' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
erge
b
ranch 'mm/v
e
rify-filename
-
fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
Merge branch 'cn/cherry-pick-
r
ange-docs' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'j
c
/
u
star-checksum
-
is-unsign
e
d' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch 'jc/b
u
nd
l
e-
c
omplete-notice' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branch 'j
c
/ls
-
f
i
les-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C Ha
m
ano
Merge
b
r
anch 'jc/request-pull-m
a
tch-tagna
m
e' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name_compare():
do not tr
u
ncate
w
hile comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C Hamano
appl
y
: tests for the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ha
m
ano
filter-branch:
d
o not forge
t
the '@' prefix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
rev-parse --
d
isa
m
biguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
e
v-pa
r
se: A and B in "rev-parse A
.
.
B" refer
t
o co
m
mittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
r
e
set
:
the com
m
and takes comm
i
tti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
c
ommit-tr
e
e
:
the comm
a
nd wants a tree and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: --build-fake
-
ancest
o
r ex
p
ects b
l
obs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
sha
1
_nam
e
.
c: add sup
p
ort for d
i
s
a
m
b
i
guating othe
r
t
y
p
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
revision
.
c
:
the "log" family,
e
x
cept for "s
h
ow"
,
takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
revi
s
ion
.
c
:
allow handle
_
revision_arg() to ta
k
e
o
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: in
t
roduce get_
s
ha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha
1
_name
.
c
:
teach lookup context to
g
et_sha1_with_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_name
.
c:
m
any short name
s
can
only
b
e
co
m
mittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
sha1_name
.
c:
g
e
t_sha
1
_
1(
)
takes look
u
p
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
sha
1
_name
.
c: get_descr
i
be_name() b
y
de
f
inition gr
o
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
rerere: ma
k
e rr-cache fanout
d
irect
o
ry honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
d
oc
u
ment --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
a
p
pl
y
: allow rerere() to work on -
-
3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
ap
p
ly: register co
n
flicte
d
stages
t
o the i
n
de
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C
Hamano
apply: --3way with
a
dd/ad
d
conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
pl
y
:
m
ove ve
r
i
f
y_index_match(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: plug the three-
w
ay
merg
e
logic
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
app
l
y: fall
b
ack o
n
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: accept -3/--3way c
o
mma
n
d
line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
mano
apply: move "alrea
d
y exi
s
ts" logic
to check_to_cre
a
te
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
pp
l
y:
m
o
ve che
c
k_t
o
_
cr
e
ate_blob() closer to i
t
s sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
app
l
y:
f
urther split l
o
ad_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: refactor "previo
u
s patc
h
" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: split lo
a
d_preimage() helper functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C H
a
mano
apply: factor out c
h
eckout
_
target()
h
elper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refac
t
o
r
rea
d
_
file
_
or_gitl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: clear_i
m
ag
e
() c
l
ears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C H
a
m
a
n
o
a
p
ply:
a
bit more com
m
ents on
P
ATH_TO_
B
E_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
a
p
ply: fix an
incomp
l
e
t
e comment in c
h
e
ck_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge gi
t
://gi
t
hub
.
com
/
gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
next