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 --octopus to mimic show-branch --merge-base
2010-08-18
Jonathan Nieder
merge-base -
-
octopus to
mimic
show-branch --mer
g
e-ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Doc
u
mentati
o
n: add
a
SEE ALSO sect
i
on for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
h
a
n Nieder
t62
0
0 (fmt
-
merge-m
s
g): style nitpick
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t6010
(
merge-base):
modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n
Ni
e
der
t76
0
0
(
m
e
r
ge
)
: test merge from branch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
ed
e
r
t7600 (merge): check
r
eflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t7600 (merge): do
not l
a
unc
h
gitk f
o
r --debu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
atha
n
N
ied
e
r
t7600 (merge):
m
oder
n
i
ze style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
: do not mistake
(
ancestor of) tag
for branch
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
te
s
t
s:
co
r
rect "does reflo
g
exi
s
t?" te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n Casey
t/: work around one-shot varia
b
le as
s
ignmen
t
wi
t
h
test_mu
s
t_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
N
ieder
t
/README: correc
t
an
e
xception w
h
en breakin
g
a &&
c
h
ain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/{t5541,l
i
b-httpd}: rep
l
ace prob
l
em
a
tic
'
!()
'
notat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/t3700: convert tw
o
uses of negatio
n
ope
r
ator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C
Hamano
Me
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Casey
t/README
:
clari
f
y
test_m
u
st_fail description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
B
r
o
ckman
Ch
e
ck size o
f
path buffer before writing into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
io C Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-07-19
R
a
lf Thielow
update-s
e
rver-info:
S
horten read_pa
c
k_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar
A
rnfjörð Bja
r
mason
g
it add: Add --
i
g
nore-missin
g
to
S
YNOPSI
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
B
jarmason
git submodule add: Remove
old
d
ocs about im
p
lici
t
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
ens
L
e
h
mann
git submodule add: Require th
e
new
-
-force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
i
o
C Haman
o
Merge branch 'jl/add-n-i
g
nore-m
i
ssing'
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
a
r
Documentation: Explai
n
git-mergetool's u
s
e of te
m
por
a
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge branch 'jc/
d
iff-mer
g
e-base-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only run aggregate-res
u
l
t
s o
v
er
actual c
o
unt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
an Ni
e
d
er
Add a sam
p
le u
s
e
r
for the svndum
p
library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io C Hamano
diff A
.
.
.
B
:
do no
t
limit
the synt
a
x to
o
n
a
r
ro
w
ly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch 'jn/pagin
a
te
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
M
e
rge bran
c
h 'wp/m
e
rge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'js/merge-rr
-
fix
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Mer
g
e b
r
anch 'jc/d
i
ff-
m
erge-bas
e
-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hama
n
o
M
e
rge
b
ranch 'ns/merge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'eb/d
o
c-log-ma
n
p
a
ge
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
Hama
n
o
Merge bran
c
h 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Mer
g
e b
r
anch
'
mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch 'jk/main
t
-status-kee
p
-index-t
i
m
estamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ha
m
ano
Merge
b
ranch
'jc/rebase-i-commit-ms
g
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
Haman
o
M
erge
branch 'ab/submodule-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
a
n
o
M
erge
branch 'bc/maint-makefile
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C H
a
mano
M
e
r
ge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
i
e
der
Documen
t
ation
:
a
d
d
s
u
b
module
.
* t
o
the big
c
o
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodules
.
5: url can
b
e a relativ
e
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an Kumar Sunkara
g
i
tweb:
f
ix e
s
c_
u
rl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
g
it --pagi
n
at
e
:
pagin
a
t
e
external commands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
ay
S
offian
MERGE_RR is
in
.
gi
t
, n
o
t
.
git/rr-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
P
a
lm
e
r
m
e
rg
e
-tr
e
e
: fix where two branches
s
hare no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add
b
asic tests for
m
erge-t
r
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
G
i
t 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge branch
'
jc
/
rea
d
-
tree-cache-
t
r
e
e
-
fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R H
a
rinath
Use dev_t for device id (st_dev) from stat in setup_git_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
amano
diff A
.
.
.
B: give one
p
ossible
d
iff wh
e
n there are mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Ju
n
io C Ham
a
no
M
erge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
g
i
t
f
e
t
c
h
d
o
cum
e
ntation
:
describe sho
r
t '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklo
s
Vajn
a
format-pa
t
c
h
: document the format
.
t
o
co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jen
s
Lehmann
git add:
A
dd the "--ignore-missing" option for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
ichael J
G
ruber
t
e
st-l
i
b: TA
P
complian
c
e for ski
p
ping te
s
ts on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
ichae
l
J
G
ruber
test-l
i
b: simpli
f
y GIT_SKIP_T
E
STS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C
Hama
n
o
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-12
Jona
t
han
Niede
r
t3000 (ls-
f
iles
-
o
): m
o
dernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredri
k
Sk
o
lmli
Documentation: Spelling
f
i
x
i
n pr
o
tocol-capabili
t
ies
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las
S
ebrecht
merge-recur
s
ive: use "up-to-da
t
e
"
instead of
"
uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nico
l
as
S
e
brecht
checkout: accord documentation to what git
d
oes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
o
hannes
S
ixt
t0005: work aroun
d
s
t
ra
n
ge $?
in
k
sh when pro
g
ram terminat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C
H
amano
Me
r
ge remote branch 'ko/master'
i
n
to j
c
/rea
d
-tr
e
e-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a gr
a
ph output bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æv
a
r Ar
n
fjör
ð
Bj
a
rmason
tests: U
s
e skip_a
l
l=* to
skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C
Ha
m
ano
Fix "
r
e
a
d-tree
-m A
B" pr
i
ming
th
e
cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
B
arzilay
R
e
organize `gi
t
-lo
g
' man page
to c
l
arify common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri
Ramliy
grep -O: Do
n
ot pass color
s
equences
a
s fi
l
enam
e
s to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio 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 branch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Mer
g
e
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a fe
w
more fixes to 1
.
7
.
1
.
X
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
ni
o
C Hamano
Merge branch 'm
a
int-1
.
6
.
4' into
m
aint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
re
v
-parse: fi
x
--parse-opt --keep-dashdas
h
--sto
p
-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge bra
n
ch
'
mg/doc-rev-parse-treepath-synta
x
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merge branch 'tr/receive
-
pack-alias
e
d
-up
d
a
te-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
erre Habouzit
fix
g
i
t branch
-
m in presence of cross devi
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
on Casey
t/t0006: spec
i
fy ti
m
e
zone as E
S
T5 not ES
T
to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
d
o not
w
rite out inde
x
when status
doe
s
not have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
H
amano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Vo
i
gt
add missing && to sub
m
odule-merge testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonat
h
a
n
N
ieder
t/RE
A
DME: document more test helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
Mak
e
file:
work aroun
d
ksh's failur
e
t
o handle missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-
d
ate: 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 branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
x
diff: op
t
i
m
ise for no white
s
pace differen
c
e when
i
gnoring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Juni
o
C H
a
m
an
o
rebase-i:
d
o not get
fooled
b
y a log
message
ending
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Ju
n
io C Hamano
rebase-i: st
y
le fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mich
a
el J
G
r
u
b
er
Documentati
o
n
: link
to gitrev
i
sions rather than git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Docume
n
t
ati
o
n: gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J Gruber
Documentat
i
on
:
s
plit off
r
ev doc int
o
include
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jakub
N
arebs
k
i
gitw
e
b: Move evaluate_g
i
tweb_config
out of run_requ
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jef
f
Kin
g
parse_d
a
te: f
i
x
signedness
in
t
imezone calcu
l
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t0006: t
e
s
t ti
m
ezone parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Ar
n
f
j
örð Bj
a
rm
a
s
on
git submod
u
le: a
d
d
su
b
modules wi
t
h git add
-
f <path>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next