repo.or.cz
/
git
/
jnareb-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
Junio
C Hamano
S
y
nc with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Git 1
.
7
.
1
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
m
ano
Merge
bra
n
c
h
'jk/p
u
sh-delete-ref
-
error
-
message' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge branch 'ar/clone-honor-umask-at-top' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch
'cw/amend-commit-withou
t
-messa
g
e'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'j
k
/
m
ai
n
t-co
m
mit-amend-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
M
e
r
ge
b
r
a
nch 'tg/main
t
-cache-name-co
m
pare' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
mano
Merge branch 'tr/
m
ain
t
-show-wal
k
' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge branch
'jc/refact
o
r
-
diff-stdin' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge branch 'mz/empty-
r
ebase-te
s
t
' into maint
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C Hamano
Merge branch '
j
s
/
fast-export-paths-with-sp
a
ces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Me
r
ge branch 'c
w
/n
o
-d
e
taching-an-unborn' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge branch 'vr/use
-
o
u
r-perl-in-test
s
' int
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
Hamano
M
erge
g
it://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
M
e
rge branch 'j
k
/
revisi
o
n-wal
k
-stop-a
t
-max-count'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Me
r
g
e
branch '
m
m
/
c
onfig-
x
dg'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge branc
h
'as/
t
4012
-
style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
erge branch 'pg
/
ma
i
nt-1
.
7
.
9-am-whe
r
e-i
s
-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge
branch
'jl/maint-
1
.
7
.
10-recurse
-
submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C Ham
a
no
Merge
branch 'ms/daemon-doc-typ
o
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
b
ranc
h
'lk/more-helpful
-
status
-
hin
t
s'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch
'
jc/sha1-na
m
e
-
more'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o
C Hamano
Merge br
a
nch 'jc/maint-filter-branch-epoc
h
-d
a
te'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
U
p
date draft release
n
otes f
o
r 7th batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
H
a
mano
Merge branch 'tg/maint-cache-n
a
m
e
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rg
e
branch 'jk/index-
p
ack-streami
n
g-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
Hamano
Merge bra
n
ch 'jk
/
maint-commi
t
-a
m
end-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branc
h
'cw/amend-commit-without-m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge branch
'
j
n
/make
f
ile-cleanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge branch
'ar/clone-honor-umas
k
-at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
H
am
a
no
Merg
e
branch 'jc/app
l
y
-
3w
a
y'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branch 'cw/rebase-i-r
o
o
t
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bra
n
c
h
'pw/git-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
Merge
b
ranch 'pw/git-p
4
-
job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hamano
Merge branch
'
jk/pu
s
h-delete-r
e
f-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Mer
g
e branch
'
jc
/
ref
a
ctor-dif
f
-
stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Me
r
ge branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
no
Merge branch 'tb/sanitize-decomposed-utf-8
-
path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge branc
h
'jn/vc
s
-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C Hamano
M
erge bran
c
h
'mm/mediawiki-
f
ile-at
t
a
c
hments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
n
o
Merge branch 'tr/ma
i
nt-show
-
wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
g
e branch 'mz/rebas
e
-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
t1512:
match the
"
other" ob
j
ect names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t
7
003: ad
d
test to filter a branch 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: Fix off by one
error in obje
c
t-head
e
r date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t
1
512: i
g
n
o
r
e
whitespac
e
s in wc -
l
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Re
d
uce
d
raft releas
e
n
otes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Sync w
i
th 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
G
i
t 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
n
o
Merge bra
n
ch 'jc/maint-blame-uni
q
ue-abbre
v
'
i
nto
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
n
ch 'rj/platform-pread
-
m
a
y-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge
b
ranch
'
th/diff-n
o
-i
n
d
e
x-fi
x
es' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C
Hamano
Merge branch 'n
d
/
c
lone
-
s
i
ngle-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
b
ranch 'jc/
r
ev-list-simpl
i
fy-merges-fi
r
st
-
p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Mer
g
e branch 'hv/submodule
-
update-n
u
k
e
-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge br
a
nch 'jk
/
diff-no-index-
p
a
g
er' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/v
e
rify-file
n
am
e
-fix' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
r
a
nch
'
c
n/
c
herry-pick-range-docs' int
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge b
r
anch 'jc/u
s
tar-checksum-
i
s-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
branch 'jc/bundle-
c
omplet
e
-notice'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'jc/ls-files-
i
-dir'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Ha
m
ano
M
er
g
e
bran
c
h 'jc/request-pull-match-tagn
a
me' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
cache_
n
a
m
e_compare
(
): do
n
o
t
t
runcate whil
e
comp
a
r
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C H
a
m
a
no
apply
:
tests f
o
r
t
h
e --3way
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Ha
m
ano
filter-branch: do not for
g
e
t
the '@' prefix
to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
rev-parse --di
s
ambiguate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse: A a
n
d B in "rev-p
a
rse A
.
.
B" refe
r
to committ
i
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
am
a
n
o
reset:
t
he
c
o
m
ma
n
d
take
s
c
o
mmittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
c
o
mmit-tree: the com
m
and wa
n
ts a tree and com
m
i
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
apply: --bui
l
d-fak
e
-ance
s
t
or
e
xpec
t
s blo
b
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
s
ha1_name
.
c
:
add sup
p
or
t
for
d
i
samb
i
g
u
ating othe
r
t
y
pes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
r
e
v
i
s
ion
.
c: the "log" family
,
e
x
cept for "sh
o
w
",
t
a
kes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
revision
.
c:
a
l
l
ow h
a
n
d
l
e
_revision_arg() to take ot
h
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
s
h
a
1
_name
.
c: introduce get_sha1_commit
t
i
sh
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sha1_n
a
m
e
.
c: teach lookup co
n
text to get_s
h
a1_with_cont
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
sh
a
1
_
name
.
c
: many sh
o
r
t nam
e
s c
a
n
on
l
y be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hama
n
o
sha
1
_name
.
c
: get_sh
a
1
_
1()
t
a
k
es lookup
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha
1
_name
.
c
: get_descr
i
be_
n
a
m
e() by de
f
initi
o
n
groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
rerere: make rr-cache fa
n
out directory hono
r
umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
app
l
y:
d
ocu
m
ent --3way op
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
allow
r
erere()
to wor
k
on --3way
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
register con
f
licted sta
g
es to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: -
-
3
w
ay w
i
t
h add/add co
n
fli
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
appl
y
: mo
v
e verify_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: plug th
e
three-way
m
erge lo
g
ic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Hamano
app
l
y: fall back on th
r
ee
-
way m
e
rg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: a
c
cept
-3
/
--3way command line opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: move "a
l
ready exi
s
ts
"
logi
c
to che
c
k_to_c
r
eat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
appl
y
: move
c
heck_to_create_blob() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
furthe
r
s
plit load
_
preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
pl
y
: refactor "previ
o
us patch" logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
s
p
lit load_
p
r
eimage() h
e
lper func
t
ion out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
app
l
y: factor out ch
e
ckout_target()
helpe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: refacto
r
read
_
f
ile_or_git
l
ink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
p
p
ly: clea
r
_image()
c
lears th
i
n
g
s a bit m
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
apply: a
bi
t
more commen
t
s on PATH_TO
_
BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
p
ly: fix a
n
incompl
e
te comm
e
nt in
c
heck_pa
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
g
it://
g
ithub
.
c
o
m/git-l10
n
/git-p
o
commit
|
commitdiff
|
tree
next