repo.or.cz
/
git
/
dkf.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
Jonathan N
i
eder
merge script: handle
-
m
--
l
og corre
c
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
an Nieder
m
e
rge
s
cript: f
o
r
bid merge -s i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
N
ieder
merge script: allow
c
u
s
tom
strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge sc
r
ipt: mer
g
e -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge
s
c
r
ipt:
i
mprove
log messa
g
e s
u
bject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
merge scri
p
t: refu
s
e to merge duri
n
g merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Niede
r
merge script:
t
weak unmer
g
e
d files mess
a
ge to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge script: --squash, --ff fro
m
un
b
or
n
branch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
fmt-merge-ms
g
-m to override merg
e
title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
m
erge-base --independent to p
r
in
t
reduced pa
r
ent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ied
e
r
m
er
g
e-base --oc
t
opus to mimi
c
show-bra
n
ch --merge-b
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
Documentati
o
n: add
a SEE ALSO section f
o
r mer
g
e-
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200
(f
m
t
-
m
e
rge-msg): style n
i
tpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (
m
erge
-
base):
modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
t
7
6
00 (
m
erge): test merg
e
from
branch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7600 (me
r
ge)
:
ch
e
ck reflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t76
0
0 (merge): do not
l
aun
c
h gitk for --de
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7600 (merge): modernize st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n
Nieder
me
r
ge:
do not mist
a
k
e
(ancestor of) tag for
b
ranch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
no
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Hamano
tests: co
r
r
e
c
t
"does re
f
log exis
t
?
"
te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work
a
round
o
ne-shot
v
a
r
iable ass
i
g
n
ment w
i
th test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan N
i
eder
t/README: correct an e
x
c
eptio
n
whe
n
b
reaking
a
&& chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/{t5541,li
b
-httpd}: replace pr
o
bl
e
matic '!()' notati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t370
0
: conv
e
rt two uses of ne
g
ati
o
n
o
p
e
rator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Juni
o
C Ham
a
no
Me
r
ge br
a
nch '
m
aint
'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/README: c
l
ari
f
y
t
est_m
u
st_f
a
il description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
B
r
ockman
Check size of path buffe
r
before w
r
it
i
ng i
n
to it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
i
o
C Hamano
M
erge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ra
l
f Thielow
u
pdate-server-info
:
Sh
o
rten read
_
pack_
i
nfo_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
g
it ad
d
:
A
dd
-
-
ignore-missing to
S
YNOPSI
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bj
a
rm
a
son
g
i
t
s
ubmo
d
ule add: Remove old docs
a
bo
u
t implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
g
it
su
b
m
o
dule add:
Require the new -
-
force opti
o
n to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
unio C Hamano
Merge branch
'jl/add-n-ign
o
re-missing'
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Docume
n
t
a
tion: Expl
a
in git-mergetool'
s
use of te
m
porar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge bran
c
h
'
j
c
/dif
f
-merge
-
base-mult
i
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas R
a
st
Only
r
un a
g
gregate
-
r
esult
s
o
v
e
r a
c
tu
a
l counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a s
a
mple user for the svndump
li
b
rary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
io C Hamano
diff A
.
.
.
B: do
n
ot limi
t
the s
y
ntax too
n
arrowl
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge branch 'jn
/
pagin
a
te-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch 'wp/mer
g
e-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ham
a
no
Merge branch 'js/
m
e
rge-
r
r-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
M
e
rge
b
ranch 'jc/dif
f
-
m
e
rge-base-mult
i
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Mer
g
e branch 'ns/m
e
rge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
M
e
rge bran
c
h
'
jn/te
s
t
s'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C
Hamano
Mer
g
e
b
ranch 'eb/d
o
c-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C
Haman
o
Merge bra
n
c
h
'
jn/grep-open
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hama
n
o
Merge bra
n
ch
'm
g
/
re
v
is
i
on-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jk
/
ma
i
nt-
s
tatus-kee
p
-index-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch 'jc/rebase-i-commit-msg-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge bra
n
ch 'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'bc/maint-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nie
d
e
r
Doc
u
mentati
o
n:
a
d
d
submodule
.
* to the big c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gi
t
modules
.
5
:
ur
l
can be a rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkara
gitweb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
g
it --paginate: pag
i
n
ate
e
xternal command
s
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
a
y Soffian
M
ERGE_RR is i
n
.
git, n
o
t
.
git
/
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Pa
l
mer
me
r
ge-tr
e
e: fix where two
b
r
a
n
ches share no change
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basic test
s
for merge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
H
a
ma
n
o
G
it 1
.
7
.
2
-
r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Juni
o
C Hamano
Merge branch 'jc/read-tree-cac
h
e-tre
e
-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
a
ja R Harinath
Us
e
dev_t for device id (st_d
e
v) from
s
t
at
i
n setup_gi
t
_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
un
i
o
C Hamano
dif
f
A
.
.
.
B: give on
e
po
s
sible
diff when there are m
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C H
a
man
o
Merge
b
ra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git f
e
tch
d
ocumentation: describe short
'
-
p
'
synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos Vajna
format-patch: document the format
.
to configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
e
n
s
L
ehmann
git
add: Add the "--ignor
e
-mi
s
sing" option for
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
ael J Gru
b
er
t
est-lib: TAP compliance for skipping tests on
r
e
quest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
a
e
l
J
Gruber
test-lib: simplify GIT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nathan N
i
ed
e
r
t30
0
0 (ls-files -o):
m
odernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredr
i
k Skolmli
Documen
t
ation: Spel
l
i
n
g
fix
in protocol-capabilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s Se
b
recht
merge-recu
r
sive: use "up-to-date" ins
t
ead of
"
upt
o
dat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
i
c
olas Sebrech
t
c
h
eckout
:
accord documentation to what git
d
oe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t0005:
work around strang
e
$
? in k
s
h
w
h
e
n program termin
a
te
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C H
a
ma
n
o
Me
r
g
e
r
emote branch 'ko/master' into jc/rea
d
-tree
-
cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Yan
g
diff
.
c
:
f
ix 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
ð B
j
arma
s
on
tests: Use skip_all=* to skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C H
a
mano
F
ix
"
read-tree -m A
B" primin
g
t
h
e c
a
ch
e
-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzi
l
ay
R
eor
g
anize
`
g
i
t
-log' man page to
c
larify common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -
O
: Do
no
t
pass color seq
u
ences
a
s
f
i
len
a
mes
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C H
a
mano
G
i
t 1
.
7
.
2
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C
Hamano
Merge
b
ranc
h
'ab/
t
ap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
bac
k
merge a
f
ew more
f
i
x
es
to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
M
e
r
ge branch
'
main
t
-1
.
6
.
4' i
n
to maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-Kön
i
g
rev-
p
arse: fix --pa
r
se-o
p
t
--ke
e
p-d
a
shdash
--stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branc
h
'
mg/d
o
c-rev-
p
arse-treepath-syntax' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merg
e
branch
'
tr/rec
e
iv
e
-pack-aliased
-
update-fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habouzit
fix git
b
ranch -m in
presence of cross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bra
n
don
C
as
e
y
t/t0006: spe
c
ify timezone as EST5 not EST to com
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do no
t
write out
index when status does not have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add mi
s
sing &
&
to subm
o
d
u
le-merge testcas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan
N
ieder
t/R
E
ADME: document more test helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
Casey
Makefil
e
: work aroun
d
ksh's failure
t
o handle mis
s
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
te
s
t-date: fix sscanf type con
v
ersion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdi
f
f: o
p
timise for n
o
whitespace di
f
fere
n
ce
w
hen ignoring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next