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: tweak unmerged files message to match builtin
2010-08-18
J
ona
t
han Nieder
merg
e
sc
r
ip
t
: tweak
u
nmer
g
ed
f
i
l
es messa
g
e
to
m
atch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nied
e
r
merge script:
--squash, -
-
ff from
unborn
b
r
a
n
ch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
a
n
Nieder
fmt-m
e
r
g
e-msg -m to override merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e-b
a
se
-
-in
d
ependent to print redu
c
ed parent
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
m
e
r
g
e
-base --o
c
t
opus to mi
m
ic
show-branc
h
--merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
Documentation:
add a SE
E
ALSO sec
t
i
o
n for merge-b
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t6200 (fmt-merge
-
msg): style ni
t
pi
c
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t601
0
(me
r
g
e
-base): mo
d
er
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nied
e
r
t7600 (
m
erge): test merge
f
rom branch yet t
o
be b
o
rn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
760
0
(merge):
check refl
o
g entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
0
0 (
m
erge):
do not launch gitk for --debu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (m
e
rge): mode
r
nize styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge:
do
n
o
t
mi
s
ta
k
e (ancestor of) ta
g
f
or
b
ranch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C Haman
o
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
unio C Hamano
tests: correc
t
"
d
oes r
e
flog exist
?
"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
ndo
n
Cas
e
y
t/: wo
r
k aro
u
nd
on
e
-shot
v
a
riable assignmen
t
with test_m
u
st_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Niede
r
t/README: correct an
e
xcept
i
on
when
b
reakin
g
a
&& chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
n
don Casey
t/{t5541,lib-h
t
tpd}: replace problema
t
ic
'!()' notati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Cas
e
y
t/t3
7
00:
con
v
ert
t
w
o
use
s
of negation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
unio C
H
amano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Cas
e
y
t/READM
E
: cl
a
rify
t
est
_
mu
s
t_fa
i
l description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gr
e
g Brockman
Check
s
ize of pa
t
h b
u
f
f
er be
f
ore wr
i
ting into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Haman
o
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thielow
up
d
a
te
-
s
e
rver-info
:
Shorten
r
e
ad_
p
ack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
g
i
t
add: Add
--ig
n
ore-missing to SY
N
OPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar
A
rnfjörð Bjarmason
g
i
t
s
u
b
m
odule add: Remove old docs about impl
i
cit -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submodul
e
add:
R
e
quire t
h
e ne
w
--f
o
rce o
p
tion to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Ha
m
ano
M
er
g
e bra
n
ch
'jl/a
d
d
-
n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David
A
g
u
ilar
Documentation: Explain git-me
r
geto
o
l's use of
t
emporar
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io
C
Ha
m
ano
Me
r
g
e branc
h
'jc
/
dif
f
-me
r
ge-base-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only run
a
g
g
reg
a
te-
r
esults ov
e
r actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonatha
n
Niede
r
Add a samp
l
e user for th
e
svndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
diff
A
.
.
.
B: do not limit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch
'jn/paginate-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
ama
n
o
Merge br
a
nch 'wp/mer
g
e-tree
-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Me
r
ge
b
ranch
'js/merge-r
r
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge branch
'
jc/diff-m
e
rge-base-multi
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Merge
b
r
anch
'ns/merge-
r
ecu
r
sive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
g
e
branch 'j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge bra
n
ch 'eb/doc-log-manp
a
ge'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Ha
m
ano
Merge branch 'jn
/
grep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge b
r
anch 'mg/revisio
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jk/maint
-
s
tatus-keep-
i
ndex-times
t
amp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
an
o
Merge
b
ran
c
h '
j
c/rebase-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
erge branch 'ab/submodul
e
-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o
C Hamano
Merge bra
n
ch 'bc
/
main
t
-makefile
-
f
ixes'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nied
e
r
D
ocum
e
n
t
ation: add su
b
modul
e
.
*
to the big configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Nieder
gitmodules
.
5:
u
rl can be a relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan K
u
ma
r
Sun
k
a
r
a
gitweb: fix
e
s
c
_u
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
t
han Ni
e
de
r
git --paginate: paginate
e
xternal comma
n
ds
a
gai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
M
ERGE_RR
i
s in
.
git, not
.
g
i
t
/
rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge
-
tree: f
i
x w
h
ere two branches share
n
o changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll
P
almer
add b
a
sic
tests
f
o
r
m
e
r
ge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hama
n
o
Git 1
.
7
.
2
-
rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Mer
g
e
branch 'jc/read-t
r
ee-ca
c
he-
t
ree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-14
R
aja R H
a
rinath
U
s
e dev_t
f
or de
v
ice id
(st_dev) fro
m
stat in
s
etup_g
i
t_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
d
iff A
.
.
.
B
: give on
e
possible
d
iff when there are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
M
e
rge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git f
e
tch
documentation: des
c
ribe
s
hort '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos Va
j
na
format-pat
c
h: document the format
.
t
o
config
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens
L
ehmann
g
i
t add: A
d
d th
e
"--ignore-m
i
ssin
g
"
o
p
tion for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Mich
a
el J Gruber
test-lib
:
TAP compliance
for
s
kipping tests
on r
e
quest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
ichael
J
Gruber
t
e
s
t-
l
i
b:
s
i
m
plify GIT_
S
KIP_TEST
S
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Juni
o
C
H
am
a
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t
3000 (ls-files -o):
m
o
dern
i
ze
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
D
ocum
e
ntation: Spelling fix
i
n p
r
o
tocol-capabil
i
t
i
es
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebre
c
ht
merge-rec
u
rsive: use "up-to-date" instead
of
"uptoda
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
N
icolas Sebrecht
checkout: accord docume
n
tation to wha
t
git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t0005:
w
ork around st
r
ange $?
i
n ksh when
program
terminat
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio C Haman
o
Merge remote branch 'ko/m
a
s
t
er' into jc/
r
ead-tree-c
a
che
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix
a
graph output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arn
f
jörð Bjarmason
te
s
ts: Use skip_all=* to skip test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C
Ha
m
ano
F
ix "read-tree
-m A B" pr
i
ming the cac
h
e-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
li Ba
r
zila
y
Reorganize `
g
it-log' man page to clari
f
y common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Na
z
ri
Ram
l
iy
gre
p
-O: Do not p
a
ss
c
olor sequences as filename
s
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Ha
m
ano
Git 1
.
7
.
2
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
Merge branch '
a
b
/
tap'
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
i
o C H
a
mano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-07
J
uni
o
C Hamano
bac
k
merge a
f
ew mor
e
f
ixes t
o
1
.
7
.
1
.
X
s
eries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Merge b
r
a
nch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe K
l
eine-König
rev-parse: fix --pars
e
-
opt --k
e
ep-d
a
shdash --
s
to
p
-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
am
a
no
Merge branch
'
mg/doc-rev-parse-
t
reepath-syntax' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
unio C
H
amano
Merge branch 'tr/receive-pack-ali
a
sed-upda
t
e-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
ierre Habouz
i
t
fix git branch
-
m
in prese
n
c
e
o
f cross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Case
y
t
/t0006: speci
f
y tim
e
zon
e
a
s EST5 not ES
T
to
c
omply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
d
o not write ou
t
index when status does not have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Ham
a
no
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add missing &&
t
o
submodule-merge testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than Nied
e
r
t/R
E
AD
M
E:
d
ocument
more test h
e
lper
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
B
r
andon C
a
s
ey
Makefile: work a
r
ou
n
d ks
h
's failure to han
d
l
e
missing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test
-
date: fi
x
sscanf type c
o
nversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdiff: optimise for
no whitespa
c
e
difference wh
e
n ignoring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
u
nio
C
Hamano
rebase-i: do not
get foole
d
by
a l
o
g
m
essage ending
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Ham
a
no
rebase-
i
: s
t
yle fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
M
i
chael
J
G
ruber
Documentation: lin
k
t
o
g
itrevisions rather t
h
a
n git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael
J Gruber
Documentation: gitrev
i
sion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J Grub
e
r
Documentation: sp
l
it off rev doc into inclu
d
e fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jak
u
b
Narebski
gi
t
web: Move
e
va
l
uat
e
_gi
t
w
e
b_c
o
nfig
o
ut of ru
n
_request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next