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 Nieder
merge script: handle -m --log correct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
er
me
r
ge sc
r
ipt:
f
orbid
merge -
s
i
n
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Ni
e
der
m
e
rge script: allow custom strategi
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge script: merge
-
X
<o
p
ti
o
n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: improve l
o
g
m
e
ssage subjec
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e script: refuse
t
o merge
during
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
Nieder
merge
scri
p
t: tweak
u
n
merged fil
e
s
message to m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script:
-
-
s
qu
a
sh, --ff
from unb
o
rn bra
n
ch a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Niede
r
fmt-merge-msg
-
m to ove
r
ride
m
erge titl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nieder
merge-base --independent to print reduced parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-bas
e
--octopus to m
i
mic show-b
r
a
n
ch --mer
g
e-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
Documenta
t
ion:
a
dd a SEE ALSO section for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
t6200
(fm
t
-merge-msg): sty
l
e nitp
i
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Niede
r
t6
0
1
0
(merge-ba
s
e)
:
moder
n
i
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
der
t7600 (merge): test merge f
r
om b
r
anch yet to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(
merge): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
t7600 (mer
g
e): do not launch gitk for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600 (merge)
:
modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge: do
n
o
t
m
istake (ancest
o
r
o
f) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
amano
G
it 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
ama
n
o
tests: correc
t
"do
e
s reflo
g
exist?" te
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bra
n
d
o
n Casey
t/:
work
around
one-shot
v
a
r
ia
b
l
e
assignment with t
e
st_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
o
n
athan Nieder
t/README: correct an exception
w
hen breaki
n
g
a
&& chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Ca
s
ey
t/{t55
4
1,lib-httpd}
:
r
e
place problematic '!
(
)' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Cas
e
y
t/t3
7
00: co
n
vert two uses of negat
i
o
n operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C
H
amano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t
/
RE
A
DME
:
cl
a
rify t
e
st
_
m
u
s
t_fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Bro
c
kman
C
h
eck size o
f
pa
t
h buffer before writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ra
l
f Thielow
up
d
ate-server-in
f
o: Sh
o
rt
e
n
read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
nfjörð Bjarmason
g
it add: Add --
i
gnore-m
i
ssing to SYNOPSI
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
rnfjörð
B
j
a
rma
s
on
git sub
m
odule a
d
d
:
Re
m
ove old d
o
cs abou
t
imp
l
ic
i
t -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Je
n
s Le
h
mann
git sub
m
odul
e
add: Require the new --f
o
rc
e
option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io
C
H
amano
Merge branch 'jl/add-n-igno
r
e-mis
s
ing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documenta
t
ion: Expl
a
in g
i
t
-m
e
r
g
etool's u
s
e of
temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C H
a
mano
M
erge br
a
nch
'
jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
o
m
a
s Rast
Only run a
g
g
rega
t
e-result
s
ov
e
r actu
a
l counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
an
N
ieder
Add a sample
user fo
r
t
h
e svndump
l
i
b
rary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C Hamano
diff A
.
.
.
B: do
not limi
t
t
h
e s
y
n
ta
x
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merg
e
branch 'jn
/
paginate-
f
i
x
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Haman
o
M
erg
e
bra
n
ch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
am
a
n
o
Me
r
ge br
a
nch
'
js/merge
-
rr-
f
i
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge bra
n
ch 'jc/diff-merge-b
a
se-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge branch 'ns/merge
-
r
e
c
ursive-u
p
tod
a
t
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
M
e
rg
e
b
r
anch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge branch
'
eb/doc-l
o
g-ma
n
p
a
ge'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hama
n
o
Merge bran
c
h 'jn/gr
e
p
-
open
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge br
a
nch '
m
g/revis
i
on
-
d
o
c'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erg
e
branch 'jk/main
t
-status-keep-index-timesta
m
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Haman
o
M
erg
e
branch 'jc/rebase-i-com
m
it-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Hamano
Mer
g
e branch
'ab/
s
ubm
o
dule
-
add-f
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hamano
Merge bra
n
ch 'bc/mai
n
t-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Do
c
umentation: add submo
d
u
l
e
.
* to
the big configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Niede
r
gitm
o
dules
.
5:
u
r
l can be a relative pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkar
a
gitweb
:
f
i
x es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
der
git -
-
paginate:
p
aginate exte
r
nal commands
a
gain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Ja
y
S
o
ffian
MERGE_R
R
is in
.
gi
t
,
not
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Wi
l
l Palmer
me
r
ge-tree:
f
i
x
where
two branches sh
a
r
e
no
chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
almer
add basic te
s
ts for merge-t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Juni
o
C Haman
o
G
it 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge br
a
nc
h
'
j
c/read
-
tree-c
a
che-tree-f
i
x
'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harin
a
th
U
se dev_t fo
r
device id (st_de
v
) f
r
om stat in setup_gi
t
_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C Hamano
diff A
.
.
.
B: give one pos
s
ibl
e
d
iff when th
e
re are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
u
nio C H
a
ma
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-13
Oren
Held
git fe
t
ch
documentat
i
on: describe
s
hort
'
-p' s
y
nonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos
V
ajna
format-patch: document the format
.
t
o
confi
g
ura
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
ens Lehmann
g
it add: Add th
e
"--ignore-
m
is
s
ing
"
option f
o
r
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
Gruber
t
est-lib: TAP com
p
l
ianc
e
f
o
r
skipping tests o
n
request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
ichael J G
r
uber
test-
l
ib: si
m
plify GI
T
_SKIP_TESTS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
athan Nie
d
e
r
t
3
000 (ls-file
s
-o):
m
o
dernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
F
r
e
d
rik Skolmli
Doc
u
mentation: Spell
i
n
g
fi
x
in p
r
otocol-capabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
m
e
rge-recursive
:
u
s
e
"
up-to-date"
instead of "upto
d
at
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
c
he
c
kout: accord
d
ocu
m
enta
t
ion to
w
hat git
d
o
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes
Sixt
t0
0
05: wor
k
around strange $? in ksh when program t
e
rminat
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge
r
e
mote
b
ranc
h
'ko/master' i
n
to jc
/
read-tree
-
c
a
che
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Yang
diff
.
c
:
fix a
graph outp
u
t bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Æva
r
Arnfjörð Bjarmason
te
s
ts: Use skip_all=* to skip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
n
io
C
Hamano
Fix "read-tree -m A B" priming
the ca
c
h
e-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
Barzilay
Reorganize `git-l
o
g
' ma
n
p
age to clarify c
o
mmon
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
N
azri R
a
mliy
grep -O:
Do not
p
ass color sequences
a
s f
i
l
enames
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
Merge b
r
anch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmer
g
e a fe
w
more fixes
t
o 1
.
7
.
1
.
X
s
e
ri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
M
e
r
ge
bra
n
c
h
'
m
aint
-
1
.
6
.
4' into m
a
int
commit
|
commitdiff
|
tree
2010-07-07
U
w
e Kleine-
K
önig
rev-pars
e
: fix -
-
par
s
e-opt --keep-d
a
shdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'mg/doc-rev-parse-tr
e
e
p
ath-syntax
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
amano
Merge
b
r
a
n
ch 't
r
/
r
ece
i
ve
-
pack-aliased-update-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierr
e
Habouz
i
t
fix git b
r
anch -m in presenc
e
of cross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/t0006: spec
i
fy ti
m
e
z
one as EST
5
not ES
T
to com
p
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
do not
w
rite out index wh
e
n sta
t
u
s does not ha
v
e to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko V
o
igt
add mi
s
sing
&
& to submodule
-
merge
t
estcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Ni
e
der
t/
R
EADME
:
document mor
e
test helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brand
o
n Casey
Makefile: work around ksh's failur
e
to han
d
le mi
s
sin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
eff King
test-date
:
fix sscanf type con
v
ersion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
Hamano
Merge br
a
nch '
m
a
int'
commit
|
commitdiff
|
tree
2010-07-06
D
y
l
a
n
R
eid
xdiff: opt
i
mise for no
w
hitespace di
f
ference when ignoring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next