repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: --ff-only to disallow true merge
2010-08-18
Jonathan Nied
e
r
m
erge scr
i
pt: --ff-only to disallow true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge script: hand
l
e
many-way
oc
t
opus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
i
eder
merg
e
scrip
t
: h
a
ndle -m --log co
r
rec
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: f
o
rbid mer
g
e -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
ied
e
r
me
r
ge script:
allow custom strate
g
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge scri
p
t:
merge -X<optio
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge scrip
t
:
i
mp
r
ove log
message
s
ubject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge sc
r
i
p
t: refuse to mer
g
e
dur
i
ng me
r
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge sc
r
ipt: tweak unmerged fil
e
s messag
e
to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
mer
g
e sc
r
ipt: --squ
a
sh, --ff
f
rom u
n
b
orn
br
a
nch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
f
m
t-merge-msg -m t
o
o
verr
i
d
e
merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
m
e
r
ge-base
--independent to prin
t
reduce
d
parent
list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e
-base --oc
t
opu
s
to mimic s
h
ow-branch --merge
-
base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
Docum
e
n
t
atio
n
: add
a
SEE ALSO section for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t6200 (fmt-merg
e
-msg): sty
l
e nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
e
r
t6010 (merge-base): modernize sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
Nieder
t
7
600
(
merge): t
e
st m
e
r
ge from branch yet
to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
t760
0
(merge): check reflog entr
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t7600 (merge): do n
o
t launch gitk fo
r
-
-de
b
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t7600 (merge): moder
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ied
e
r
merge: do n
o
t m
i
sta
k
e
(ancestor of) tag for bra
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o C
H
amano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
m
a
n
o
tests: cor
r
ect "does reflog e
x
is
t
?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
B
rando
n
Case
y
t/: work around
one-shot
v
aria
b
le assignm
e
n
t
with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
ath
a
n Nieder
t/README
:
correct
an ex
c
ept
i
on when br
e
aking a && c
h
a
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
do
n
Casey
t/{t554
1
,
l
ib-httpd}:
r
e
pla
c
e problematic
'
!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t
/t37
0
0: convert two uses of negation
oper
a
tor
'
!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/READM
E
: c
l
arify test_must_fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
G
r
eg Broc
k
m
a
n
Che
c
k size of path bu
f
fer before writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
i
o C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thielow
update
-
server-
i
nfo: Shor
t
en re
a
d_pack
_
i
n
fo_fi
l
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð Bj
a
rmason
git add: Add --i
g
nore-missing
to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git
submo
d
ule add: Remove old docs abo
u
t im
p
licit
-
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Je
n
s Lehmann
git su
b
module ad
d
: Requir
e
the new
-
-fo
r
ce o
p
tion to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch '
j
l/add-n-ign
o
re-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguil
a
r
Docu
m
ent
a
t
i
on:
E
xplain git-
m
ergetool's use
of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C H
a
ma
n
o
Merge b
r
anch 'jc/diff-m
e
rge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas Rast
Onl
y
r
u
n a
g
gregate-resul
t
s
over a
c
tual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
t
h
an N
i
eder
Add a
sample
u
ser for the svndump lib
r
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Ham
a
no
diff A
.
.
.
B: do not
limit the syntax t
o
o
narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'jn/p
a
g
i
nate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
aman
o
Merg
e
branch 'wp/merge
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge
b
ra
n
c
h
'js/merge-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge
branch '
j
c
/diff-merge-b
a
se-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C H
a
man
o
Merge branch 'ns/merge-recurs
i
v
e
-
upto
d
at
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
ano
Merge bran
c
h 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge b
r
an
c
h
'eb
/
doc
-
lo
g
-manp
a
ge'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Merge branch 'jn/gr
e
p
-
open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C
H
amano
Mer
g
e branch 'mg/revision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
c
h 'jk/maint-
s
tatus-keep-in
d
ex-timestamp
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'jc
/
re
b
ase-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Me
r
ge branch 'ab/s
u
b
module-add
-
f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge
b
ranch 'bc/
m
aint
-
make
f
ile
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Haman
o
M
e
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
Documentation
:
ad
d
submodule
.
* to the big configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
g
i
tmodule
s
.
5: url
can be a re
l
ative
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Su
n
ka
r
a
gitwe
b
: fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
g
i
t --pa
g
in
a
te: pagi
n
a
te ex
t
e
r
na
l
command
s
again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Ja
y
Soffian
MERGE_RR is in
.
git
,
not
.
g
it/r
r
-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
merge-tree: fix whe
r
e tw
o
branche
s
share n
o
c
hanges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll
P
almer
add
basic
test
s
for merge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio
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
Merge branch
'
j
c
/rea
d
-tree-cache-tree
-
f
ix'
commit
|
commitdiff
|
tree
2010-07-14
R
aja R H
a
rinath
Use dev_t
for devi
c
e id (st
_
de
v
)
f
rom stat in setup_git_d
i
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff
A
.
.
.
B: give one pos
s
ibl
e
diff wh
e
n there
ar
e
m
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ha
m
ano
Mer
g
e br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
He
l
d
g
it
f
et
c
h documenta
t
ion: desc
r
ibe short '-p' synon
y
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos V
a
jna
format-patch: docum
e
nt the format
.
to configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
ens
Le
h
mann
git add
:
A
d
d
the "--ignore-missing" opt
i
on fo
r
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
t
e
st-lib
:
TAP comp
l
iance for
skipping tes
t
s on r
e
quest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michae
l
J Gruber
test-lib
:
simplif
y
GIT_S
K
IP_TE
S
TS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C
H
a
m
a
no
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
atha
n
Niede
r
t3000 (ls-files -o): m
o
dern
i
ze
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documentatio
n
: S
p
elling
fix in p
r
o
t
ocol-capabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Se
b
rec
h
t
m
e
rge-recursive: use "up-to-dat
e
" instead of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las Sebrecht
checkout: accord documenta
t
ion to wha
t
git
does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
ohanne
s
Sixt
t0005: work
around strange $? i
n
ksh w
h
e
n
pr
o
gram t
e
rminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge
r
emote br
a
nc
h
'ko/ma
s
ter' into jc/
r
ead-tree
-
cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o Yan
g
diff
.
c: fix a
graph outp
u
t bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar
A
rnf
j
örð Bjarmaso
n
tests
:
Use skip_all=*
to
s
kip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Jun
i
o C Hamano
Fix
"
read-tree -m
A
B" priming the c
a
che-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorganize
`
g
i
t-log' man page
t
o c
l
arify common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
N
azri
Ramliy
g
re
p
-O
:
Do
n
o
t
pass color sequences as fi
l
enames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
am
a
no
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Haman
o
M
erge
b
ranch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
b
a
ckmerge a few more f
i
xes
t
o 1
.
7
.
1
.
X s
e
rie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
i
o C Hamano
Merg
e
branch '
m
a
int-1
.
6
.
4' into
ma
i
n
t
commit
|
commitdiff
|
tree
2010-07-07
Uwe K
l
eine-König
rev-pa
r
se: fix --pa
r
se-opt
-
-
k
eep
-
d
ashdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'mg/d
o
c-rev-parse-treepath-syntax' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
M
e
rge bra
n
ch 'tr
/
rece
i
ve-p
a
ck-aliased
-
upd
a
te
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Hab
o
uzit
fi
x
git bra
n
ch
-m in
presence of
c
r
os
s
device
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
Casey
t/t0006: spec
i
fy timezone as EST5 not EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
do not
w
rite out
index when
stat
u
s
do
e
s not have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io C Hamano
Merge
branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Hei
k
o Voigt
add miss
i
ng
&& to submodule-mer
g
e testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
a
than Niede
r
t/
R
EAD
M
E: do
c
ument mor
e
test helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
Makefil
e
: work aroun
d
ks
h
'
s failure t
o
handle
missing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jeff
K
in
g
test-date:
f
ix s
s
canf type conve
r
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next