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-base --independent to print reduced parent list in a merge
2010-08-18
Jonathan Nieder
merge-base --indepe
n
dent to pr
i
nt reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-b
a
se
--octopus to mim
i
c
s
ho
w
-
b
ranch --
m
erge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
ed
e
r
Documentation: add
a
S
E
E
A
LSO section for mer
g
e-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t6200 (fmt-merge-m
s
g)
:
style n
i
tpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t60
1
0 (
m
erge
-
base): mode
r
nize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an
N
i
eder
t760
0
(merge): test merge from branc
h
yet
to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
e
der
t7600 (merge): ch
e
ck re
f
log
e
n
try
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7600 (merge): do not lau
n
ch
g
itk f
o
r --
d
ebug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7600
(
mer
g
e
): moder
n
ize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e: do not mi
s
take (ancestor of) tag f
o
r bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
ano
Git
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Hamano
tes
t
s: correct "doe
s
reflog exist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on Cas
e
y
t/:
w
ork ar
o
und o
n
e-shot variable
assignment wi
t
h test_must_
f
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onatha
n
Nieder
t/REA
D
ME: correct an exception when breaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/
{
t5541,lib
-
httpd}: replace
problemati
c
'!
(
)
' not
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t/t3
7
0
0
:
c
onvert two
uses of negation operato
r
'!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Ju
n
io C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Cas
e
y
t/README: clarif
y
test_mu
s
t
_fail d
e
scriptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Ch
e
ck
s
i
z
e
of path buff
e
r befo
r
e writing in
t
o it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
H
a
ma
n
o
Merge br
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
R
a
lf Thi
e
low
u
p
date-ser
v
er-info: Shorten read_pack
_
info_fil
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git add: Add --ignore-mis
s
ing to
SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æv
a
r Arnfj
ö
rð Bjarmason
g
it
s
ubmodule
add: Remove o
l
d docs about i
m
p
licit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
gi
t
su
b
modu
l
e add: R
e
quire the new --force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C Hamano
Merge branch 'j
l
/add-
n
-
i
gn
o
re-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
D
o
cumen
t
ation
:
E
x
plain g
i
t-
m
ergeto
o
l
'
s
use of
temporar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io C Hamano
Merge branch
'jc/diff-mer
g
e-
b
ase-multi
'
commit
|
commitdiff
|
tree
2010-07-16
Thoma
s
Rast
O
nl
y
run aggre
g
ate
-
resu
l
ts over actu
a
l counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
t
h
an
N
ieder
Add
a
sa
m
pl
e
u
s
er
for th
e
svn
d
u
mp l
i
brary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
H
a
m
ano
diff A
.
.
.
B: do not
l
imit t
h
e syn
t
a
x
t
oo
n
arro
w
ly
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ham
a
no
Merge bra
n
ch 'jn/paginat
e
-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branc
h
'wp/merge-tre
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
ama
n
o
Merg
e
br
a
nch 'jc/diff-merge-base-multi
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
H
amano
Merge branch 'ns/merg
e
-recursiv
e
-uptodate
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
M
erge branch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Me
r
ge
branch 'eb/doc
-
log-
m
anpage
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge
b
ranch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge branch 'mg/re
v
i
sion-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
rg
e
branch 'jk
/
maint-status-keep-i
n
dex-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge branc
h
'jc/rebase-
i
-commit-msg-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e
bra
n
c
h 'ab/
s
u
b
module-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merg
e
branch 'bc/
m
aint-makefil
e
-fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C
H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
a
n Nieder
D
ocume
n
t
ation: a
d
d s
u
bmodule
.
*
to
the bi
g
con
f
igura
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodul
e
s
.
5: url can be
a relative
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kum
a
r Sunkara
gitweb
:
f
ix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nie
d
e
r
git --pagi
n
ate: paginate external
c
ommands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
fian
MERGE_
R
R is
i
n
.
git,
not
.
git
/
rr-
c
ac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
merge-tre
e
: fix where two branches share no chang
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add ba
s
ic test
s
for
m
erge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
unio
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
M
erge branch 'jc/r
e
ad-tree-ca
c
h
e-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
R
aja
R
Harinath
Use dev_t for
d
evice id (st_dev)
from
s
tat
in setup_git
_
dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
u
nio C
H
amano
diff A
.
.
.
B: give one p
o
s
s
ible diff when there are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren
H
e
ld
g
it fetc
h
documentation: describe sh
o
rt '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos V
a
jna
f
o
rm
a
t
-
p
a
tch
:
docum
e
nt t
h
e format
.
to config
u
ration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Je
n
s
L
ehm
a
nn
gi
t
add:
A
d
d the "--ignor
e
-missing" option
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michae
l
J Gruber
test-
l
i
b
: TAP complianc
e
for
s
kipping tests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michae
l
J Gr
u
ber
t
e
st-l
i
b: simplify GIT_SKIP_TESTS
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Ha
m
a
no
M
e
rg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nat
h
an Nieder
t3000 (ls-files -o): modern
i
z
e styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
F
redrik Skolmli
D
o
cumentation: Spelling fix
i
n protocol-capabil
i
t
ies
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
ebrecht
m
e
r
ge-r
e
cursive: use "up-to
-
d
ate" instead of "uptoda
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
icolas Seb
r
e
c
ht
check
o
ut: acco
r
d documentat
i
on to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes S
i
xt
t0005
:
work a
r
ound st
r
ang
e
$? in ksh w
h
en program
t
erminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Haman
o
Merge
r
e
m
ot
e
br
a
n
ch 'ko/master' into jc/read
-
tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: f
i
x a g
r
aph
o
u
tput bu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð
Bjarmason
tests: Use skip_all=* t
o
ski
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
unio C Hamano
Fi
x
"read-tree
-m
A B"
p
rimi
n
g the cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
B
a
rzilay
Reorganize `
g
i
t-log' ma
n
p
a
ge
t
o cl
a
r
ify
common
di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri
R
amliy
g
r
ep -O:
D
o no
t
pass color
seq
u
ences as filena
m
es
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
Git 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge
b
ranch 'ab/
t
a
p
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
backmer
g
e a
fe
w
more fixes t
o
1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Ham
a
no
M
e
r
ge
bra
n
ch 'maint-1
.
6
.
4
'
into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kl
e
ine-Kö
n
ig
rev-parse:
f
ix --
p
arse-opt --keep
-
dashdash --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-par
s
e-treepath-syntax
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merg
e
bran
c
h 'tr/receive-p
a
c
k-alia
s
ed-up
d
ate-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Hab
o
uzi
t
f
i
x
g
it branch -m in presence 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 timezon
e
as EST5 not EST to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
do not write out index when
s
tatus
d
oes not h
a
ve to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Hei
k
o
V
o
igt
ad
d
m
i
ss
i
ng &&
to submod
u
le-merge testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than N
i
eder
t/R
E
AD
M
E: document m
o
re test helpe
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
on
C
as
e
y
Makefile: wo
r
k
around ksh's failure to handle missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
e
ff Kin
g
test
-
d
a
te: fix sscanf type conver
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dyl
a
n Reid
x
diff: optimise f
o
r no white
s
p
a
c
e differen
c
e when ignoring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
r
e
ba
s
e
-
i:
d
o not get fooled
by a log me
s
s
a
ge endi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
rebase-i:
s
ty
l
e fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
ic
h
ae
l
J Gruber
Document
a
tion: link
t
o git
r
evisions rather th
a
n
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
i
c
h
a
el J Gruber
D
o
cume
n
t
a
t
ion
:
gi
t
revisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J
Gruber
Docu
m
entati
o
n
: sp
l
it off rev doc
int
o
include file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jakub
Narebski
gitweb: Mo
v
e evaluate_gitweb_config ou
t
of run_
r
equ
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jeff
K
i
ng
parse_date: fi
x
signedness in timezone calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-05
Jef
f
K
i
ng
t0006: t
e
s
t timezone parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next