repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'as/t4012-style-updates'
2012-07-22
Junio C
H
a
mano
Merge branch 'as/t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Merge branch
'
p
g/maint-1
.
7
.
9
-am-wher
e
-is-pat
c
h
'
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
Hamano
M
erge branch 'jl/ma
i
nt-1
.
7
.
10-r
e
curse-submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
am
a
no
Merge bra
n
ch 'ms
/
daemon-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Merge branch 'lk/mor
e
-helpf
u
l-status-h
i
n
ts'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge branc
h
'jc/sh
a
1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merg
e
b
r
anch 'j
c
/m
a
int-filter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
A
lexander Stras
s
er
t4012:
Use test_mu
s
t_fail instead of if-el
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Johannes Sixt
t
4
0
1
2:
u
se 'p
r
intf' instead of 'dd' to
generate a
binary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander Str
a
sser
t4012: Re-i
n
dent t
e
st sn
i
ppets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Al
e
xander Strasser
t4012
:
Make --shortstat
t
est more r
o
bust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander
S
trasser
t4012: Bre
a
k up pipe into serial
redirections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander St
r
asser
t4012: Actua
l
ly
quote the sed script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Michae
l
Schubert
Document
a
tion
/
g
it-da
e
mo
n
:
a
dd mis
s
ing w
o
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
eff King
st
a
tus
:
color in-progress message like ot
h
er
h
eader
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Update draft rel
e
ase
n
otes
for 7th b
a
tc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
Hamano
Merge branch 'tg/m
a
int-
c
ache-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
Merge bran
c
h 'jk/index-pack-stre
a
ming-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
unio
C
Hamano
Merge branch 'jk/
m
aint-commit-amen
d
-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
a
man
o
Me
r
ge
b
ranch 'c
w
/amend-co
m
mit-
w
i
t
hout
-
mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o
C Ha
m
ano
Merge branch 'jn
/
m
akefi
l
e-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hama
n
o
Merge bra
n
ch
'
ar
/
clon
e
-honor
-
umask
-
at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ham
a
no
M
e
rge branch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branc
h
'c
w
/re
b
ase
-
i
-
r
oot'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
bran
c
h
'
pw/git-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C Ham
a
no
Merge branch 'pw/git
-
p4-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hama
n
o
Merge bra
n
ch 'jk/push-delete
-
re
f
-error-message'
commit
|
commitdiff
|
tree
2012-07-13
P
a
ul G
o
rtmaker
am
:
i
ndi
c
ate
w
here a faile
d
p
a
t
c
h
is to be fo
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hamano
Sixth bat
c
h for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Mer
g
e branch '
j
c/
r
efa
c
tor-d
i
ff-
s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Mer
g
e branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge branch 'tb/saniti
z
e-d
e
composed-utf-8-pathna
m
e
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e
b
ran
c
h 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Ham
a
n
o
Mer
g
e branch 'jn/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Mer
g
e b
r
anch 'mm/mediawiki
-
f
i
l
e-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge b
r
anch 'tr/maint-show-w
a
lk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merge
b
r
a
nch
'
m
z/rebas
e
-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
t1
5
12: match th
e
"other" ob
j
ect nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4:
a
dd support
for '
p
4 m
o
ve' in P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
i
o
C H
a
m
a
n
o
t7003
:
add test to filter a branch wi
t
h a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C
Ham
a
no
date
.
c:
Fix
off by
o
ne error in object-h
e
ad
e
r da
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jens L
e
hmann
su
b
module
s
:
don't stumble over symbolic
l
inks when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
t1512: ignore w
h
i
tespa
c
e
s
in wc -l outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Al
e
x
and
e
r Strass
e
r
t4012: Unquote git
c
o
mmand fragment in tes
t
title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander St
r
a
s
s
e
r
t4012: modernize
s
tyle fo
r
quotin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Reduce draft r
e
le
a
se note
s
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
Hamano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch
'
jc/ma
i
nt-
b
lame-
u
nique-ab
b
r
e
v
' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
ano
Me
r
ge bran
c
h
'
rj/
p
l
atfo
r
m-pread-may-be-t
h
r
ead-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge branch
'th/diff-n
o
-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch 'nd/clone-
s
ingl
e
-f
i
x
'
into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge br
a
nch 'jc/rev-l
i
s
t-si
m
plify-merges-first-p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge
b
r
a
nch 'h
v
/submodule-update-n
u
k
e-submodule
s
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
j
k/
d
iff-no-
i
nde
x
-pager' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'm
m
/verify-file
n
ame-
f
ix
'
into
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
amano
Merge branch 'cn
/
cherry-pick-range-docs' into main
t
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Hama
n
o
Merge branch '
j
c/ustar-chec
k
sum
-
is-
u
nsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Ha
m
ano
Merge bran
c
h 'jc/
b
undle-
c
omp
l
ete-notic
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
erge branch 'jc/ls-fil
e
s-i
-
di
r
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge b
r
anch 'jc/request-
p
ull-match-tagname' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
c
a
c
he_
n
ame_co
m
pare(
)
: do not truncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
eff King
ind
e
x-
p
ac
k
: loop wh
i
l
e
i
nflating objects
in unpack_data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
f
f
King
commit: fix "--amen
d
--only" with no pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
ap
p
l
y:
t
e
s
ts for t
h
e --3
w
a
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jef
f
King
add:
create ADD_EDIT
.
p
a
tc
h
with mode
066
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-branch: d
o
not
f
o
rget the '@
'
pre
f
ix
t
o force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rev-parse -
-
disambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
a
n
o
re
v
-parse: A and
B
i
n
"rev-pa
r
s
e
A
.
.
B"
r
efer
to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
reset: the co
m
m
and takes commi
t
tish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
c
ommit-tree: t
h
e
c
o
mmand wants a tr
e
e
and
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply:
--build-fake-ance
s
tor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Ha
m
a
n
o
sha1_name
.
c: add support for
d
isambiguating
other
t
ype
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revisio
n
.
c: the "log"
family, exce
p
t for "
s
ho
w
", take
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
rev
i
s
i
on
.
c: a
l
low handle_
r
evision_arg(
)
to take
o
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: int
r
oduce get
_
sha1_committi
s
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
sha1_
n
ame
.
c:
t
e
a
ch l
o
okup co
n
t
e
xt to get_sha
1
_
wit
h
_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
sha
1
_nam
e
.
c: many short names
c
an onl
y
be comm
i
ttish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
s
ha1
_
nam
e
.
c: get_sha1_1(
)
takes lookup
f
lags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
sh
a
1_name
.
c: g
e
t_descri
b
e_name() by
definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rere
r
e
:
ma
k
e rr-
c
ache fanout dire
c
tor
y
h
o
nor
u
mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
appl
y
:
d
ocument --3wa
y
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
a
pply: allow rerere()
t
o
work
on -
-
3way result
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
app
l
y: register
conflic
t
e
d
s
tages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
app
l
y: --3way with add/ad
d
conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
amano
a
pply: move verify_ind
e
x
_
m
atch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: plug
the thr
e
e-way merge logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
apply: fall
back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
a
p
ply
:
accept -3/--3way command line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
a
p
ply: move "
a
lr
e
ady
e
xi
s
ts"
l
ogic to
c
heck_to_c
r
e
a
te()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
appl
y
:
m
o
ve
check
_
to_c
r
eate_b
l
o
b
(
) closer
t
o its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
a
no
apply: further
split
l
oad_pr
e
i
m
ag
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
apply:
r
e
f
actor
"previous pa
t
c
h" logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
appl
y
:
s
pl
i
t l
o
ad_preimage() helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
appl
y
:
fa
c
tor out checkout_targe
t
() he
l
per function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: refactor read_file_or_g
i
tli
n
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
a
p
ply: clea
r
_image() clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
a
p
p
l
y: a bit more comments
o
n
PA
T
H_TO_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
am
a
no
apply: fix an incomplete
c
o
mm
e
nt in check_patc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex
R
iesen
R
estore umasks influence on the per
m
i
s
s
i
ons
of wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next