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
merge script: handle -m --log correctly
2010-08-18
J
o
n
a
than Nieder
merge script: handle
-
m --log corre
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: fo
r
bid merge -s ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an
Nieder
merge
script:
a
llo
w
cust
o
m strat
e
gies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ied
e
r
merge sc
r
i
p
t:
merge -
X
<
opt
i
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
m
e
rge script: improve lo
g
message subje
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge
script: re
f
use to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
mer
g
e s
c
ript: tweak unmerged files message
t
o ma
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
me
r
ge
scri
p
t: --squash, -
-
ff fro
m
unborn branch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg
-
m t
o
overr
i
de mer
g
e tit
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
-
b
ase
-
-independent
t
o
p
rint re
d
uced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base -
-
octopus to mimic show-branch --merge
-
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
Documentatio
n
: add a SEE ALSO section
f
o
r
merge-ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge-ms
g
): sty
l
e n
i
tpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t6010
(
merge-base): moderniz
e
sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
ed
e
r
t7600 (merg
e
): test
m
e
rge from branch yet to be bo
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
t7600
(merge):
check r
e
flog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7600
(merge):
do not la
u
nch gitk f
o
r --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
t7600 (
m
e
r
ge): m
o
dernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
me
r
ge: do not mistake (ancestor of
)
tag for
b
ra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o C Ha
m
ano
Git
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o
C Hamano
tests: correct "does
r
e
flo
g
exist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work a
r
ound one-sho
t
variable a
s
sign
m
ent with
t
est_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onathan Ni
e
der
t
/
README: correct an
e
xcep
t
i
on when brea
k
ing a && ch
a
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t/{t55
4
1
,
lib-httpd}: rep
l
ace pr
o
blematic '!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
n
don
Casey
t/t3700: convert two uses of negati
o
n operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
J
u
nio C H
a
ma
n
o
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
C
asey
t/
R
E
ADME:
clarify test_must_f
a
i
l
desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
Br
o
ckman
Ch
e
ck size of path buffer before writing in
t
o it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
io C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
u
pdate-s
e
rver-inf
o
:
Shorten read_pac
k
_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æv
a
r Arnfjörð
Bjarmason
git ad
d
: Add --ignore-missing to SY
N
OPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æv
a
r Arnfjörð B
j
a
r
mason
g
i
t s
u
bmodule
ad
d
: Remove
old docs a
b
out implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git subm
o
dule add:
R
equi
r
e
the new --forc
e
option
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
e
rg
e
branch 'jl
/
ad
d
-n
-
ignore-missing
'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Explain git-m
e
rge
t
ool
'
s use of tem
p
o
rary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
amano
Merg
e
branch 'j
c
/diff-
m
e
r
ge-base-mult
i
'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as Rast
Only r
u
n
aggreg
a
te-results over actu
a
l
counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jo
n
athan N
i
ed
e
r
Add a sample user fo
r
the
s
vndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
amano
d
i
ff
A
.
.
.
B
:
d
o not limit th
e
syntax too
n
arro
w
ly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Me
r
ge branch 'j
n
/pagina
t
e-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
a
no
Me
r
ge branch 'wp/me
r
ge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Me
r
ge branch 'js/merge
-
rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch 'jc/diff-merge
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge bra
n
ch
'
ns/merge-
r
ecursi
v
e-up
t
odate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
an
o
M
e
rge branch 'j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Hamano
Merge
b
r
anch
'eb/doc-log-manpag
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch 'jn/gr
e
p-open
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'mg/revisio
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge branch 'jk/maint-status-
k
eep-index-ti
m
e
s
tamp'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o C Haman
o
Merg
e
branch 'jc/reb
a
se-i-comm
i
t-msg-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
M
e
rge branch 'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'bc/
m
a
i
nt-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation
:
a
dd
submodule
.
* to the big configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan Nied
e
r
gitmodules
.
5:
u
rl
can be a rel
a
tive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
K
umar
S
u
nkar
a
gitweb: fix esc_
u
rl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
der
gi
t
--paginate: pa
g
i
nate e
x
te
r
nal commands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is in
.
git, no
t
.
git/rr
-
c
ache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
merge-tree: fi
x
wh
e
re two bran
c
hes s
h
a
r
e no
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
ad
d
basic tests f
o
r m
e
rge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C Hamano
Git 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge b
r
an
c
h 'jc/
r
ead-
t
ree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
aj
a
R Harinath
Use dev_
t
f
or
d
evice id (st_dev) from
stat i
n
setup_
g
it_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: gi
v
e one po
s
si
b
le di
f
f when there
are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hama
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
Held
git
f
e
tch docume
n
tati
o
n: des
c
ribe short '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
fo
r
m
a
t-
p
atch: doc
u
men
t
the format
.
t
o
configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jen
s
L
e
hma
n
n
git add: Add
the "--ignore-missing" opt
i
on for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gr
u
ber
test-lib: TAP com
p
liance for skipp
i
ng tests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
a
e
l J
G
ruber
t
e
st-lib: sim
p
lify GIT_SKI
P
_TES
T
S
l
oop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C
H
amano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-12
J
onathan Nieder
t3
0
0
0
(ls-files -o
)
: mod
e
r
n
ize
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documentation: Spelling
f
i
x
in
protocol-ca
p
abi
l
ities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrech
t
merge-recurs
i
ve: use
"
u
p-to-date"
i
nstead of "upt
o
date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
checkou
t
:
a
ccord documentati
o
n
t
o
w
hat git
does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
o
hannes Sixt
t0005: wo
r
k
a
roun
d
stra
n
ge $? in
k
s
h w
h
e
n
p
ro
g
ram ter
m
i
nated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio C
Ham
a
no
Merge remote br
a
nch 'ko/mast
e
r' into jc/re
a
d-tree-cach
e
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a graph ou
t
put bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arn
f
j
ö
r
ð Bjarmason
tes
t
s: Use skip_al
l
=* t
o
skip tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
F
i
x
"read-tree -m A B" priming the c
a
che-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli B
a
rz
i
lay
R
e
o
rganize `git-log
'
man pag
e
to
c
l
ari
f
y com
m
o
n
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Naz
r
i Ramliy
grep -O: Do not pass color se
q
uences
a
s
fi
l
en
a
mes to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
Git 1
.
7
.
2-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Merge
b
ranch '
a
b/t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
Merge
b
ra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
back
m
erg
e
a few more f
i
x
e
s
to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'maint-1
.
6
.
4' into ma
i
nt
commit
|
commitdiff
|
tree
2010-07-07
Uwe
Kleine
-
König
rev-parse: fix --p
a
r
s
e
-
opt --keep-d
a
shdash --stop-a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Mer
g
e branch '
m
g
/
doc-
r
e
v-pa
r
se-t
r
ee
p
a
t
h-syn
t
a
x
' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
Ha
m
ano
Merge branch 'tr/receive-p
a
c
k
-ali
a
sed-up
d
ate-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
err
e
Habouzit
fi
x
g
it
branch -m in presence of c
r
oss dev
i
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
Casey
t
/t
0
0
06
:
specify timezo
n
e as EST5
not EST to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do not write ou
t
index when
s
tatus does not have t
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Ha
m
ano
M
e
rge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add mi
s
sing &&
t
o submodu
l
e-mer
g
e t
e
stcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Ni
e
der
t/READ
M
E
: document
more test
helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Br
a
n
don Casey
M
akefile
:
w
ork around ksh's failure to handle miss
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff Ki
n
g
t
est-date: fix sscanf ty
p
e conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
H
ama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-06
D
y
l
an Rei
d
xdiff: optimis
e
f
o
r no
w
h
itespa
c
e differe
n
ce when i
g
noring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next