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 --no-ff --no-commit correctly
2010-08-18
Jonathan Nied
e
r
merge
s
cr
i
pt
:
handle --no
-
ff --no-com
m
it correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
merge scri
p
t: --ff-o
n
ly to disallow true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
r
g
e script: handle many-way
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
script:
h
andle
-
m -
-
lo
g
corre
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
m
erge script: forbid me
r
ge -s
i
n
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge s
c
ri
p
t: allow custom
s
t
r
ategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Niede
r
merge
s
cript: me
r
g
e -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge scr
i
pt: improve
lo
g
message subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: ref
u
se to m
e
rge
durin
g
m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge scri
p
t: tweak unmerged fil
e
s message to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
me
r
ge scr
i
pt: --
s
quash, --ff
fr
o
m
un
b
orn bra
n
ch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
f
m
t
-
m
erg
e
-msg -m to over
r
ide merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge
-
ba
s
e --ind
e
pendent to print r
e
duced parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
der
m
erge-base --octopus to mimic
sho
w
-branch -
-
merge-ba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
Docum
e
nt
a
t
ion: add a
SEE A
L
S
O
section for merge-ba
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t620
0
(fmt-merge-msg)
:
style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nie
d
er
t6010 (merge-base): modernize s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t7600 (merge): tes
t
merge from branch yet to be bor
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): che
c
k reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do n
o
t launch gitk for
-
-debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7
6
0
0 (merge): modern
i
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Ni
e
der
merge: do not
mista
k
e
(a
n
cestor of
)
t
ag
for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o C Hamano
tests: correc
t
"does reflog
exis
t
?"
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/:
wo
r
k
aroun
d
one-shot varia
b
le assig
n
ment wi
t
h
tes
t
_must
_
fai
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
o
n
athan Nied
e
r
t/RE
A
DME
:
correct
an
e
xception when brea
k
ing a && cha
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon Casey
t/
{
t5541
,
lib-httpd
}
: replace proble
m
a
t
i
c '!()' notat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n Casey
t/t3700: convert two uses of
negati
o
n operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C
Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
C
asey
t/README: cl
a
rif
y
test_must_fail
descript
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brock
m
an
Che
c
k size
o
f
p
ath buffer before
writing into
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
T
hielo
w
update-s
e
r
v
er-info: Shorten read_pack_i
n
fo_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnf
j
ö
rð Bjarmason
git add:
A
d
d --ignor
e
-
m
issi
n
g to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð B
j
armason
git
sub
m
odule add: Remove old docs about implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehm
a
n
n
g
it submodule
a
d
d
:
Re
q
uire t
h
e new
-
-f
o
rce option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Haman
o
Me
r
ge branch 'jl/add-n
-
ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Documentati
o
n: Explain git-merge
t
ool's use
o
f temp
o
r
ary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Juni
o
C Ha
m
a
n
o
M
e
r
ge
branch 'jc/di
f
f-
m
erge-ba
s
e-
m
ulti
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
On
l
y
r
u
n
aggregate-results ov
e
r actua
l
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Add a sample user for the
svndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
diff A
.
.
.
B: do not l
i
mit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge
b
ranch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
b
r
a
n
ch 'j
s
/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'j
c
/
d
iff-me
r
ge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge
branch 'ns/merge-
r
ecursive-uptodat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch '
j
n/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e b
r
anch 'eb/doc-l
o
g-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch
'
j
n
/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch
'mg/revision
-
doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge bran
c
h 'jk/maint-status-k
e
e
p-in
d
ex-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ham
a
no
Merge branch 'jc/r
e
base-
i
-commit
-
msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch 'ab/
s
u
bmodu
l
e-add
-
f
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hamano
Merge branch 'b
c
/maint-makefi
l
e-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
an
c
h '
m
ain
t
'
commit
|
commitdiff
|
tree
2010-07-15
J
o
nat
h
an Nieder
Documentation
:
a
dd submodule
.
*
to t
h
e big
c
onfiguratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
Nied
e
r
gitmodules
.
5
: url
c
an
be a relati
v
e 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
Jon
a
t
h
an Nied
e
r
git --paginate: pagi
n
ate
externa
l
c
ommands
agai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERG
E
_RR i
s
in
.
git
,
not
.
g
i
t/
r
r-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
a
lmer
merge-tr
e
e
: fix wher
e
two
b
r
a
nches share
n
o changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add bas
i
c tests for
merge
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
n
i
o
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
Mer
g
e branch 'jc/
r
ead-t
r
ee-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
a
ja R
Harina
t
h
U
s
e
dev_t for device id (st_dev) from s
t
at in
setu
p
_git
_
dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C
H
amano
diff A
.
.
.
B:
give one
p
oss
i
ble diff
when there a
r
e more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
amano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren H
e
ld
git fe
t
ch doc
u
mentation:
d
es
c
ribe short '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklo
s
V
a
jna
f
or
m
at-
p
a
tch: document
t
he
format
.
to configuratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehm
a
nn
git a
d
d:
Add the "--
i
g
n
ore-missing" opti
o
n for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Grube
r
test-lib: TAP co
m
pliance f
o
r
skipping tests on
r
equest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-lib: simp
l
ify GIT_SKIP_TE
S
TS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nie
d
er
t3000 (ls-fil
e
s -o): moder
n
ize
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
F
redrik Skolmli
Documentation:
S
p
elling
f
i
x
in protocol-capab
i
l
i
ti
e
s
.
tx
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nico
l
as Sebrecht
merge-re
c
ursiv
e
: use "up
-
to-d
a
te"
i
nstead of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
c
hec
k
o
u
t: a
c
cord
document
a
tio
n
t
o what
git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
o
h
annes Sixt
t
00
0
5: work around strange $? in k
s
h wh
e
n
program terminate
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Juni
o
C Ha
m
ano
Merge remote b
r
anch 'ko/master' i
n
to jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Ya
n
g
diff
.
c: fix
a graph output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjör
ð
Bjarmason
tests
:
U
s
e ski
p
_a
l
l=*
to
skip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio C H
a
man
o
Fix "
r
ead-
t
ree -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'
man page to
clarif
y
c
ommon diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do not p
a
s
s col
o
r sequences as filenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Git
1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hama
n
o
Mer
g
e br
a
nch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Haman
o
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
back
m
erge a few more fixes t
o
1
.
7
.
1
.
X
s
eri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
m
ano
Me
r
ge branch
'main
t
-1
.
6
.
4
' int
o
main
t
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kl
e
i
n
e-K
ö
nig
rev-
p
arse:
fi
x
--p
a
rs
e
-opt --keep-dashd
a
sh --sto
p
-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
a
n
o
Merge branch 'mg/doc-rev-parse-tr
e
e
path-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Me
r
ge branc
h
'
t
r/r
e
ce
i
ve-pack-aliased-u
p
date-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pi
e
rre Habouzit
fix git branch -m
i
n
presenc
e
of cross
devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Cas
e
y
t/t0
0
0
6: spe
c
i
f
y
t
i
mezone as EST5 not
E
ST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do not w
r
i
te
out index
when status
doe
s
n
ot
have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
He
i
ko Voigt
add
missing
&
&
to
s
ubmodule-merge testcas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/README: document more t
e
s
t
hel
p
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon C
a
sey
M
akef
i
le: work a
r
ound
ksh's fail
u
re to handle
m
issing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next