repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add tests for merging with submodules
2009-04-05
Clemens Buch
a
cher
a
dd test
s
f
o
r merg
i
ng w
i
th sub
m
o
du
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
G
I
T 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge
b
r
anc
h
'jc/maint-1
.
6
.
0-
b
lame-s'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io
C
Hamano
Merge branch 'js/mai
n
t
-dif
f
-temp
-
smudge'
i
nto main
t
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o C
H
ama
n
o
Me
r
ge
b
ran
c
h 'js/ma
i
nt-1
.
6
.
0-e
x
ec-path-env' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge branch 'bc/maint-1
.
6
.
1-bran
c
h-deleted-was' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
an
o
M
e
rg
e
bra
n
ch 't
r
/m
a
int-1
.
6
.
1-doc-format
-
pa
t
ch
-
-root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nch 'dm/maint-docc
o
' into maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C Ha
m
a
n
o
Merge bra
n
c
h
'
maint-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Holge
r
Weiß
D
o
cume
n
tation
:
Remove an odd "instead"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
eff K
i
ng
fix p
o
r
t
a
b
i
l
i
ty problem with IS_RUN_COMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Joha
n
n
es Schindelin
m
a
i
lmap: r
e
surrect lo
w
er-casing
of ema
i
l addr
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
U
pda
t
e draft release notes to
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
un
i
o
C Ha
m
ano
Merge b
r
anch 'maint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-30
J
unio C Hamano
Mer
g
e branch 'maint-1
.
6
.
0'
i
n
to maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (a
k
a
.
.
.
Fi
x
b
a
sh completion in pat
h
with
spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Ras
t
bash
c
omp
l
e
tion: only s
h
o
w 'log
-
-
merge' if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich
-
Schot
.
.
.
git-tag(1):
a
dd hint a
b
out co
m
mit messa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
All
a
n
Caffee
Documentatio
n
: up
d
ate graph a
p
i
e
xample
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Hamano
Merge branch 'maint-
1
.
6
.
0
' in
t
o main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-
s
vn: f
i
x
l
s-tree us
a
ge wit
h
dash-pref
i
xed pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Sc
h
i
n
d
elin
imp
o
r
t-
z
ips:
fix t
h
i
n
ko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-lib:
C
l
ean u
p
c
o
mments and Makefi
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
T
h
o
mas R
a
s
t
D
o
cument
a
tion: format-patch --ro
o
t
c
l
a
r
ifications
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
C
arl
o
Marcelo Arenas
.
.
.
d
ocumentation: update cvsimpo
r
t descriptio
n
o
f "-r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
Mel
l
or
Do
c
umentation:
R
emove spuriou
s
uses of "
y
o
u"
in
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-25
Joha
n
n
e
s Sixt
d
i
f
f --no-
i
ndex
:
D
o not
gene
r
at
e
patch
o
utput if other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Shawn
O
.
Pearce
Incr
e
ase the size of
t
he die
/
warning buf
f
er
to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Ha
m
ano
M
er
g
e branc
h
'ma
i
nt-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-03-24
Junio
C Hamano
Me
r
ge branch 'm
a
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Linus Torval
d
s
c
l
ose_sha1_file(): make
it easier to
di
a
gno
s
e err
o
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Nicolas P
i
t
r
e
avoi
d
possible overflow in
d
elta
s
ize filtering
c
omputation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
avid J
.
Mel
l
or
Docum
e
n
tation:
minor grammatica
l
fix in git-ch
e
ck-ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David
J
.
Mellor
D
ocumentation
:
minor g
r
ammatical fix
e
s in
git-check
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
a
v
i
d J
.
Mello
r
Documentati
o
n: minor
grammat
i
cal fixes
i
n
g
it-c
a
t-file
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mell
o
r
Documentation: minor grammatical
f
ixes and rewording
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
D
a
vid J
.
M
e
l
l
or
Documentation: rem
o
ve some
u
se
s
o
f
t
h
e passiv
e
voice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge branch 'maint-1
.
6
.
0
'
in
t
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
J
o
hannes S
c
hindelin
Smudge the
fi
l
es
fed to external diff and te
x
t
c
onv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyd
a
y: use the d
a
shle
s
s form of
g
it-init
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio
C
Hama
n
o
Update draft rele
a
se notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
ls-f
i
l
e
s: require work
t
ree whe
n
--deleted is giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Ren
é
Sc
h
a
r
fe
pickaxe: c
o
unt regex
matches only o
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Junio C
Haman
o
Merge
branch
'ma
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
io
C Hamano
Merge branch 'tr/maint-1
.
6
.
0-send-email-irt'
in
t
o maint
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o C Hamano
M
er
g
e br
a
nch 'mg/maint-
s
ubmodule-normalize-path' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C Hamano
Me
r
ge branch 'rs/memmem' into mai
n
t
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C Hamano
M
e
rge br
a
n
ch 'js
/
rsync-local'
into
ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Junio
C
Hamano
M
e
rge branc
h
'db/mai
n
t-missing-origin' i
n
to
maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge bra
n
ch
'jc/maint-1
.
6
.
0-re
a
d-tree-overlay' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Ham
a
no
Me
r
g
e
branc
h
'js/maint-1
.
6
.
0-path-normalize' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Mer
g
e branch 'jc/maint-1
.
6
.
0-pack-di
r
ectory' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Stephen Boyd
format-pat
c
h: --numbered-
f
iles an
d
--stdout aren't
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Si
x
t
Propa
g
ate --
e
xec-path setting to exte
r
na
l
comman
d
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Brandon
C
asey
git-bra
n
ch:
displ
a
y "w
a
s
sha1" on
bran
c
h
d
eletion r
a
ther
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-20
David J
.
M
ello
r
Documentation:
reword example t
e
xt
in git-bisect
.
t
x
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Jeff King
doc: clarify how -S
w
orks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Da
v
id J
.
Mellor
Docume
n
tation: re
w
ord
e
d the "Description
"
s
ection of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-18
Juni
o
C
Ha
m
ano
blame: r
e
ad custom grafts
given by -S before ca
l
ling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
Dav
i
d J
.
Mellor
D
o
cument
a
tion: minor grammatic
a
l
f
ixes in git-branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
M
ell
o
r
Docum
e
n
tatio
n
: mi
n
o
r
g
ramma
t
i
cal fixes in git-blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Documentat
i
o
n
:
rewor
d
the "Description" sec
t
ion of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
D
a
vi
d
J
.
M
e
l
l
or
Documentation: minor grammatical fix
e
s
in
g
it-ar
c
hive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-16
Junio C Ha
m
ano
Remove total
c
onfus
i
on from git-fetch an
d
g
i
t
-
push
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-15
Juni
o
C Hamano
GIT 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Ha
m
ano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
n
o
M
e
rg
e
branch 'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
J
unio C Hamano
M
erge
br
a
nc
h
'en/m
a
in
t
-1
.
6
.
1-ha
s
h-object' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hama
n
o
Merge branch 'ks
/
m
a
int-1
.
6
.
0-mailinfo-folde
d
' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge br
a
nch 'cc/maint-1
.
6
.
0-bi
s
ec
t
-fix'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C H
a
m
ano
Merge bra
n
c
h
'fg/maint-1
.
6
.
0-
e
xclude-
b
q' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
Merge branch 'js/maint-1
.
6
.
1-f
i
lte
r
-branch-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Hamano
Merge bra
n
c
h
'gt/
m
aint-1
.
6
.
1
-utf8-width' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branc
h
'js/maint-1
.
6
.
1-remote-remo
v
e-mirror
'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hama
n
o
Mer
g
e branch '
e
k/m
a
int-1
.
6
.
1-fi
l
t
er-
b
ranch
-
ba
r
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge bra
n
ch 'j
c
/maint-
1
.
6
.
1-add-u-rem
o
ve-conflicted
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C
H
amano
Merge branch 'js/maint-1
.
6
.
1-rebase-i
-
submodule' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Hama
n
o
Me
r
ge branch 'jc/maint
-
1
.
6
.
1-all
o
w-uninteresting-missing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
e
r
g
e branch
'
ks/main
t
-1
.
6
.
0-mai
l
info
-
folded'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Ham
a
no
M
erge bran
c
h
'
j
k/main
t
-1
.
6
.
1-
c
leanup-
a
f
t
er-exec-failure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
unio C
Hamano
Merge branch 'jc/mai
n
t
-
1
.
6
.
0-sp
l
it-diff
-
m
e
t
ainfo' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C
H
ama
n
o
r
e
a
d-tree A B C: do
n
ot create a bog
u
s index and do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
s
en
d
-email: test --no-
t
hread -
-
i
n-reply-to com
b
ination
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
J
unio C Hamano
Updat
e
draft release note
s
for 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
J
u
nio
C Hamano
Merge branch '
j
s/maint-send-email' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-03-11
Junio C H
a
m
ano
Me
r
g
e branch 'jk/sane-re
l
a
t
i
ve-time' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio
C
Haman
o
Merge branch
'
jc/maint-add-p
-
unqu
o
te' into mai
n
t
commit
|
commitdiff
|
tree
2009-03-11
J
u
n
io C Hamano
Me
r
ge b
r
an
c
h '
f
g
/
m
a
int
-
exc
l
ude
-
bq' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-03-11
J
u
nio C Hamano
Mer
g
e branch 'en/maint-ha
s
h-object'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-03-11
Jo
h
ann
e
s Schindelin
rsy
n
c
transpo
r
t: al
l
ow loca
l
paths
,
and fix t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Daniel Ba
r
kal
o
w
Give erro
r
w
h
e
n no remot
e
is configur
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-08
J
unio C Hamano
M
e
rge
br
a
n
c
h 'maint-1
.
6
.
1' int
o
m
ain
t
commit
|
commitdiff
|
tree
2009-03-07
Chris
Johnsen
builtin-revert
.
c: rele
a
se index lock
w
hen cherry-p
i
cking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
d
oc
u
ment config
--bool-or-int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Je
f
f King
t
1
300
:
use
t
est_must_fail a
s
appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
René Schar
f
e
c
l
e
anup:
add isasci
i
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next