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
Merge branch 'mm/config-xdg'
2012-07-22
Junio C Hamano
Merge
branch
'
mm/confi
g
-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge
b
ranch 'as/t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e
b
ranch 'p
g
/maint-1
.
7
.
9-am-where-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e
branch 'jl/maint-1
.
7
.
10-recur
s
e-submodu
l
es
-
wit
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch
'ms/daemon-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hama
n
o
Merge branch
'
lk/more-helpful-
s
tatu
s
-hints'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o C Hamano
Merge branch 'jc/sha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
a
mano
Merge
b
r
anch 'j
c
/
mai
n
t-fil
t
e
r
-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
A
l
exand
e
r Strasser
t4012: Use te
s
t_must_f
a
il
i
nstead of
i
f-else
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Johannes Sixt
t40
1
2: use 'printf' instead of '
d
d'
t
o gen
e
rate a b
i
na
r
y
.
.
.
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 Strass
e
r
t4012:
R
e-indent
t
e
s
t
snippe
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander Stra
s
ser
t4012
:
Mak
e
--s
h
o
r
tstat te
s
t
more ro
b
ust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander St
r
a
s
ser
t4
0
12: Break up p
i
pe
i
n
t
o
serial redirections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
A
l
exande
r
S
t
rass
e
r
t
4
0
1
2: Actually q
u
o
t
e
the sed script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matt
h
ieu Moy
co
n
f
i
g: fix several access(NULL) calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Michael Schube
r
t
D
ocumentatio
n
/git-daemon:
a
dd missing word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Je
f
f King
stat
u
s: co
l
o
r
in-progress message like
other header
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Update dra
f
t release
notes for 7th bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
r
g
e bran
c
h 'tg
/
m
aint-cach
e
-n
a
m
e
-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
a
mano
Merge br
a
nch
'jk/index-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge
branch 'jk
/
maint-commit-amend-only-
n
o-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
erge bra
n
ch
'
cw/amend-commi
t
-
w
ithout-messag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Mer
g
e
bra
n
ch 'jn/ma
k
ef
i
l
e
-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
M
e
rge
branch
'ar/clone
-
honor
-
uma
s
k
-
at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge branc
h
'jc/app
l
y-3
w
ay'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Me
r
ge
b
ranch 'cw/rebase-
i
-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'pw/g
i
t-p4-mo
v
e'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Ham
a
no
Merge
b
ranch 'pw/git-p
4
-
jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
mano
Me
r
ge branch '
j
k/push-d
e
lete
-
ref-error-message
'
commit
|
commitdiff
|
tree
2012-07-13
P
aul Gortmaker
a
m
: indicate w
h
er
e
a failed patch is to be found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
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
Jun
i
o C
H
amano
M
erge
branch
'
jc/refactor
-
diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch 'tg/ce-name
l
en'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge branch 'tb/saniti
z
e-decomp
o
sed-utf
-
8
-
pathname'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ha
m
ano
Merge branch
'
m
m/medi
a
w
iki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C H
a
mano
M
erge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Me
r
ge branc
h
'mm
/
mediawiki
-
file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
erge branch 'tr/m
a
int-show-
w
al
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'mz/re
b
ase-
n
o-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Haman
o
t1512: ma
t
ch the "other"
o
b
ject na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ga
r
y Gi
b
bons
git p4:
a
d
d
s
up
p
ort f
o
r
'p4 move' in P
4
Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Hamano
t7003: add
test t
o
filter a branch w
i
th a commi
t
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
d
ate
.
c: Fix off by
o
ne er
r
o
r
in objec
t
-head
e
r date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jens Lehmann
submod
u
l
e
s: don'
t
stum
b
l
e
o
v
er symbolic
l
i
n
k
s
w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
t1512: ignore w
h
itespaces in
w
c -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ale
x
ande
r
Strasser
t4012: U
n
quote gi
t
com
m
and fra
g
m
e
nt in test t
i
tle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander Strasser
t
4012: moderni
z
e
style fo
r
quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Reduce draft release notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Sync wit
h
1
.
7
.
1
1
.
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 H
a
m
a
n
o
Me
r
ge branch 'jc/maint-blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Mer
g
e branch 'rj/platform-pread-may
-
be-thr
e
ad-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
Me
r
ge
br
a
nch 'th/diff-no-i
n
d
e
x
-fi
x
es'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'nd/clo
n
e-singl
e
-
f
ix'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'j
c
/re
v
-list-simplify-m
e
r
g
e
s-
f
irst-
p
arent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
b
ranch 'hv/submodule-update
-
nu
k
e-su
b
m
o
d
u
les
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merg
e
branch 'jk/diff
-
no-index
-
pager' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'mm/verify-f
i
len
a
me-fix'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Mer
g
e
br
a
nch 'cn/che
r
ry-p
i
c
k
-
ra
n
ge-doc
s
' into
m
ain
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
e
rge branch 'jc/u
s
tar-che
c
ksum-is-unsigned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
M
e
rge branch
'jc/bundle-c
o
mple
t
e-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge bra
n
ch
'jc/ls-files-i-dir
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
Ha
m
ano
M
erge branch 'jc/reques
t
-pull-matc
h
-tagname' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
cache_
n
ame_compa
r
e(): do not truncat
e
while
comp
a
ri
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
i
n
d
e
x
-pack: loop while inflati
n
g objects
in unpac
k
_
d
ata
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
ing
c
o
mmit
:
fix "--amend
-
-
only" w
i
th no pat
h
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
Hamano
apply
:
tests for
the --
3
way
o
ptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
in
g
add: cr
e
ate ADD
_
EDI
T
.
patch
with mo
d
e
0
666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Hamano
fil
t
er-branch: do not
for
g
e
t
the '@'
p
refix to fo
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
rev-parse -
-
dis
a
mbiguate=<p
r
efix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
r
e
v-
p
arse: A and B in "rev-
p
arse A
.
.
B" ref
e
r to co
m
mittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
reset:
t
he command ta
k
es comm
i
ttish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
commit-tre
e
:
t
h
e command wants
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 Hamano
apply: --build-fake-ancestor
e
x
pects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_name
.
c: add support
for dis
a
m
b
i
guating other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
revi
s
ion
.
c
:
the
"log" fam
i
ly, except for "show
"
, ta
k
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
revision
.
c: allow handle_
r
e
vi
s
i
on_arg()
to take ot
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
s
h
a1_name
.
c:
i
ntroduce get_sha1_com
m
ittish
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sh
a
1_nam
e
.
c: teach loo
k
u
p
conte
x
t t
o
get_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: ma
n
y short
n
ames can o
n
ly be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_na
m
e
.
c: get_sha1_1(
)
ta
k
e
s
looku
p
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ha
m
ano
sha1_name
.
c:
g
e
t
_describe_nam
e
()
by defin
i
tion grok
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
rerer
e
: make rr-cache fanou
t
dir
e
c
t
ory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: docu
m
ent --
3
way o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
apply
:
a
l
low rerere()
t
o
work on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
apply
:
regis
t
er confl
i
cte
d
stag
e
s to the
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
apply: --3way with add/
a
dd co
n
flic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
m
ove verify
_
ind
e
x
_m
a
tc
h
() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
apply: plug the t
h
ree-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
app
l
y: fall back on thre
e
-way m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a
c
c
e
pt -3/--
3
way co
m
mand line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
pply:
m
ove "already
e
xists" logic to check
_
t
o_creat
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
app
l
y:
m
ove ch
e
ck_to_creat
e
_
bl
o
b()
c
l
o
ser t
o
its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
am
a
no
a
p
ply:
fur
t
her split
l
o
ad_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
ano
appl
y
: re
f
a
ctor
"pr
e
vious
patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply
:
split loa
d
_
p
r
eimage() helper f
u
nction
o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out checkout_target()
h
el
p
er fu
n
cti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
a
ma
n
o
ap
p
l
y:
ref
a
ctor read_file_o
r
_gi
t
link()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
pply: clear_image() clears th
i
ngs a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: a bit more comment
s
on PA
T
H_TO_BE_DELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next