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 'hv/link-alt-odb-entry'
2012-07-17
M
atth
i
eu M
o
y
git-remote-
m
ediawiki: fix incorrect test
usage in
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Alexander Strasser
t4012: U
s
e test_must_fail inst
e
a
d
of i
f
-else
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Johanne
s
Sixt
t40
1
2:
use 'prin
t
f
'
i
nstead
o
f 'd
d
' to
g
enerate a
b
i
nary
.
.
.
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 St
r
asser
t4012: Re-indent
t
est snippet
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Al
e
xander
Str
a
sser
t401
2
: Ma
k
e
--shorts
t
at test more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
A
l
exa
n
der
Strasser
t
401
2
:
Break
u
p
pipe into serial redirections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
A
l
exander Strasser
t4012
:
Actually q
u
ote th
e
s
e
d
sc
r
ip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
a
t
thieu Moy
git-re
m
ote-media
w
i
ki: proper
l
y deal with
invalid remot
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
M
a
tthieu Moy
git-remote-mediawiki:
s
how
progress informati
o
n
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthie
u
Moy
git
-
r
emot
e
-mediawiki
:
show
p
rog
r
e
ss
i
nform
a
tion when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Ma
t
thieu Moy
git-remote-mediawiki:
u
s
e --force when
a
d
ding n
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Mat
t
hieu Moy
git-r
e
mote-me
d
iawiki
:
g
e
t rid of O(N
^
2) loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Mo
y
gi
t
-remote-media
w
iki: make mediafile
s
export o
p
tional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
git-rem
o
te-mediaw
i
k
i
: actually sen
d
em
p
ty comm
e
nt
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Mo
y
git-re
m
o
te-media
w
iki: don't s
p
lit
na
m
es
p
aces
w
i
th
s
paces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Matthieu Moy
c
onfig: fix
s
e
veral access(NULL) calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Michael Sc
h
ub
e
rt
Do
c
ument
a
tion/gi
t
-daemon:
a
dd
mi
s
si
n
g word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Je
f
f King
status: color in
-
progre
s
s
m
e
ssa
g
e like other header
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Haman
o
U
p
d
a
t
e draft release notes for 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge
b
ra
n
c
h 'tg/m
a
i
n
t-cache
-
name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
r
g
e branch 'jk/index-p
a
c
k-s
t
rea
m
ing-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge b
r
anch 'jk/main
t
-commit-
a
mend-only-n
o
-path
s
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merg
e
branch 'cw/
a
mend-com
m
it-
w
ith
o
ut-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
M
e
rge branch 'jn/makef
i
l
e-cl
e
a
n
up'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ha
m
ano
M
erg
e
branch 'ar/clo
n
e-honor
-
umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge
b
ranch 'jc/apply
-
3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hama
n
o
Merge
branc
h
'cw/reb
a
se-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
br
a
n
ch 'pw/git-p4-m
o
v
e
'
commit
|
commitdiff
|
tree
2012-07-15
Štěpán Němec
doc: A
f
ew minor copy ed
i
ts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merg
e
b
ranch 'pw/git-p4-jo
b
s'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
Mer
g
e br
a
n
c
h
'jk/
p
ush-dele
t
e-ref
-
error
-
mes
s
age'
commit
|
commitdiff
|
tree
2012-07-13
P
a
ul Gortma
k
er
a
m: i
n
dic
a
te wh
e
re 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
S
ixth batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge branch 'jc/refactor-diff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
anch
'tg/ce-namel
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ha
m
ano
M
er
g
e branch 'tb/sanitize-d
e
c
o
m
posed-ut
f
-8-p
a
t
hnam
e
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge branch 'mm/mediawi
k
i-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge
b
ra
n
c
h 'jn/
v
c
s
-
s
vn'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C Ham
a
n
o
Merge branch 'm
m
/media
w
iki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Merg
e
bra
n
ch 'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hamano
M
e
rge
branch 'mz/rebase
-
n
o-mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
e
ff K
i
ng
r
e
v
ision: avoid work after --max-count is reached
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
t1
5
12: match the "other" object names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
G
a
r
y
Gibbons
git p4
:
add support for 'p4
move' in P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C H
a
mano
t7003: add
test
t
o fil
t
er
a b
r
anch wi
t
h a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
dat
e
.
c
:
Fix o
f
f by o
n
e error
i
n obj
e
ct-h
e
ader date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Jens L
e
hm
a
n
n
su
b
m
od
u
l
es:
don't stumble o
v
er symbolic
links
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
t
1512: ignore w
h
itespaces in wc -
l
outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Alexander Str
a
sser
t4012: Unquote git
command fragment
i
n test title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
A
lexander Strasser
t4012:
modernize style for quo
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
R
e
duce 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
w
it
h
1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
n
o
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merg
e
bran
c
h 'jc
/
maint
-
blame-unique-abb
r
e
v' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch
'
rj
/
p
latform
-
pr
e
a
d
-ma
y
-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge
branc
h
'th/diff-n
o
-i
n
d
e
x-fixes' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge bra
n
ch '
n
d/clon
e
-si
n
gle-fix' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/rev-list-simplif
y
-
merge
s
-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
Merg
e
b
ran
c
h 'hv/submodu
l
e-updat
e
-nuke
-
submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'jk/diff-n
o
-index-p
a
g
e
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge bra
n
ch 'm
m
/verify
-
filename-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'cn/cherry-pick
-
ra
n
ge-
d
ocs'
into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Haman
o
Merge branch
'
jc/us
t
ar
-
checksum-is-uns
i
g
ned' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Hamano
Merge branch 'jc
/
b
undle-co
m
p
lete-notice
'
in
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge br
a
nch 'jc/l
s
-
files-i-dir
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
Merge
b
r
anch 'jc
/
request-pull-match-ta
g
name'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gummerer
S
t
rip na
m
elen out of ce_flag
s
into a ce_namelen
f
i
eld
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C Hama
n
o
Merge branch 'tg/maint-c
a
che-name-compar
e
'
into t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
cach
e
_
n
ame_compare(
)
:
d
o
not truncat
e
while compar
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
inde
x
-pack
:
loop
w
hile
inflating objects in
unpack_
d
ata
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff K
i
ng
co
m
mi
t
: fix "--amend --o
n
ly" wit
h
no pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
ap
p
l
y: tests for
the --3way
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
eff King
add: create
ADD_
E
D
I
T
.
patch with m
o
d
e
066
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
amano
f
i
lter-branch: d
o
not forge
t
the '@' pre
f
ix to
fo
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
rev-parse
-
-disambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse: A and B in "rev-parse A
.
.
B
"
refer to
c
om
m
itt
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
r
e
set:
t
he comma
n
d take
s
c
o
mmitti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
commi
t
-tree: the
com
m
a
n
d wants a tree and
commi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
app
l
y: --build-fa
k
e-ancest
o
r expe
c
ts blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1
_
name
.
c: add sup
p
o
r
t for disambiguating
o
ther
types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
r
evision
.
c
: th
e
"
log" family,
exc
e
pt for "sh
o
w", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
revision
.
c:
allow handle
_
revi
s
i
on_arg()
t
o take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
s
ha
1
_name
.
c: introd
u
ce get_sha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
s
h
a1_name
.
c: tea
c
h
lookup contex
t
to ge
t
_
sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha
1
_name
.
c
:
m
any short names can
o
nly be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha1_name
.
c: get_
s
ha1
_
1() t
a
kes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Haman
o
sh
a
1_n
a
me
.
c: get_des
c
r
i
be_name() by
d
efinition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
a
n
o
rerere: make
r
r-cache fanou
t
d
i
rectory honor umas
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
apply: docume
n
t --3way opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
a
pply: allow rerere() to wor
k
on -
-
3way
r
esults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register confl
i
c
ted stage
s
to the
i
n
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with add/add conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: m
o
ve verify_
i
nd
e
x_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
ap
p
ly: plug
the three-
w
ay me
r
ge logi
c
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
p
p
ly: fall
b
ack on th
r
ee-way merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: accept -3/--3way command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "already exists" logic to chec
k
_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: move
c
h
e
c
k_to_create_
b
lob() cl
o
ser to
i
ts
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: furth
e
r spl
i
t l
o
a
d
_preimage(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply
:
refa
c
tor "pr
e
vious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next