repo.or.cz
/
alt-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: learn --[no-]rerere-autoupdate
2010-08-18
J
o
n
a
than Ni
e
der
merge
s
c
r
ipt: learn
--[n
o
-]rerere-autoupd
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
mer
g
e sc
r
ip
t
: noti
c
e @{-1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
m
erge scr
i
pt: h
a
ndle --no-ff -
-
no-co
m
mit co
r
r
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge
script:
-
-ff
-
only to dis
a
llow true merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge script: handle many-way octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
ed
e
r
merge script: ha
n
dle
-
m -
-
log correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
sc
r
i
p
t
: forbid
m
erge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nied
e
r
merge script:
allow custom strate
g
ie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n
Nieder
merge script: merge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
merge s
c
ript: impro
v
e
log mess
a
ge subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Nie
d
e
r
merge script: refuse to merge d
u
ri
n
g
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: tweak u
n
merged file
s
message to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script:
--squash, --ff from unborn
branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fmt-merge-msg -m to ov
e
r
ride merg
e
title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merg
e
-base --in
d
ependent to print
r
educed parent li
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than Nieder
merge-base
-
-o
c
topus to mimic
s
h
o
w-bra
n
ch
--merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Documentation: add a SEE
A
L
SO se
c
tion for merge
-
base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t6200 (f
m
t-
m
erge-msg): st
y
le nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han
N
ieder
t6010 (merge
-
base
)
: mo
d
e
r
nize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t7600
(merge): test merge fr
o
m b
r
anch yet
t
o be bor
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Ni
e
der
t7
6
0
0 (merg
e
): check re
f
log entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge): do not launch gitk fo
r
-
-debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Nieder
t7600 (merge): modernize styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
e
r
merge: do not mistake (ancestor
of) tag for bra
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
i
o
C
H
a
mano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
Ha
m
ano
tests: correct "
d
oes reflog ex
i
st?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on Cas
e
y
t/: wor
k
around o
n
e-shot variable assignment with test_must_fa
i
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: correct an exception wh
e
n breaking a && ch
a
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Cas
e
y
t/{t5541,
l
ib-httpd}: replace problematic
'!()' no
t
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n C
a
sey
t/
t
3700: convert two uses of
negat
i
on operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Jun
i
o
C
Hamano
Me
r
ge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon C
a
sey
t/README: cl
a
rify t
e
s
t_must_fail d
e
scrip
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check siz
e
of
p
at
h
bu
f
fer before writing into
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
u
pdate-se
r
ver-info
:
Sh
o
rten read_pack_info_file(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar
Arnfjörð
B
jarm
a
son
gi
t
add:
Add
-
-igno
r
e-missing to SY
N
OPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnf
j
ö
r
ð Bjarmason
git submodul
e
add: R
e
m
ove old doc
s
about
i
mplicit
-
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens
L
ehmann
git sub
m
o
d
ul
e
add: Req
u
ire the
n
ew
-
-f
o
rce option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
e
rge branch 'jl/a
d
d-n-ig
n
ore-mis
s
ing'
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
l
a
r
Docum
e
nta
t
ion: Expl
a
in git-mergetool's
u
se of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
Merge branch 'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
homas R
a
st
Only
r
u
n
ag
g
regat
e
-re
s
ults ove
r
actua
l
co
u
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Ni
e
der
Add a
sample user
for the svnd
u
mp libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C
H
amano
diff A
.
.
.
B: do not limit the s
y
n
tax too narr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C
Hamano
Merge
b
ranch 'jn/
p
agin
a
te-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge
branch 'wp/merge-tre
e
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge branch 'js/merge-rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C
H
amano
M
erge branch 'jc/diff-mer
g
e-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge bran
c
h 'ns/merge-r
e
curs
i
ve-up
t
odate'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge b
r
a
n
c
h 'j
n
/
t
ests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Me
r
ge branch 'eb
/
doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e bra
n
ch 'jn
/
grep-ope
n
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
man
o
Me
r
ge branch 'mg/
r
e
v
ision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
mano
Mer
g
e
branch
'
jk/main
t
-
s
tatus-keep-index-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
M
er
g
e bra
n
c
h 'j
c
/rebase-i-
c
ommit-
m
sg-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch 'bc/m
a
int
-
makefile-
f
ixes
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Ha
m
ano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Docu
m
ent
a
tion: add submodul
e
.
*
t
o th
e
big
configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
ede
r
gitmodules
.
5: url
c
an be a rela
t
ive pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an K
u
mar Sunkara
gitweb:
fix es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Nieder
g
i
t
-
-pagin
a
te: paginate external
comma
n
ds
agai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Sof
f
ian
MER
G
E_RR
is in
.
g
i
t, not
.
git/rr
-
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
a
lmer
m
erge-tree: fi
x
where
two branches share no ch
a
n
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
ad
d
b
asic tests for merge
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
n
io C
H
amano
G
it 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Ha
m
ano
M
erge branch
'
jc/read-tree-cache-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use d
e
v_t for dev
i
ce id
(s
t
_dev) from
stat in setup_g
i
t_
d
ire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
Hama
n
o
diff A
.
.
.
B: give
one possible d
i
ff when there
a
re more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren
He
l
d
git fetc
h
d
ocumen
t
ation: describe short '-p
'
synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Mi
k
los Vajna
fo
r
mat-patch:
d
ocume
n
t th
e
format
.
to
configurat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jen
s
Le
h
mann
git
a
d
d:
A
dd t
h
e "--ignore-mi
s
sing" option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
Gruber
test-li
b
: TAP compliance for skipping tes
t
s
on r
e
q
u
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-lib: simplify GIT_
S
K
I
P_TESTS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
M
e
rge
b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000
(
ls-fi
l
es -o):
m
odernize styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Sko
l
mli
Documenta
t
ion: Spelling fix
i
n protocol-capabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Se
b
recht
merge-recursive: u
s
e "u
p
-
t
o
-
date" inste
a
d of
"uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las S
e
b
r
echt
checkout: accord documentati
o
n to wh
a
t git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Jo
h
annes
S
ixt
t0005: wo
r
k
around str
a
n
g
e $? in ksh when program termi
n
ated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge r
e
mote branch
'
ko/master' i
n
to jc/read-tr
e
e-c
a
che
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
d
iff
.
c: fi
x
a
g
raph
output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð
Bjarmaso
n
tests:
Use skip_all=* to skip
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Jun
i
o C
H
amano
Fix
"read-tree -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
Eli Barzilay
Reorganiz
e
`git-log'
man pag
e
t
o
c
larify co
m
mon diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
N
a
z
r
i Ram
l
iy
grep -O: Do not pass color
s
eque
n
ces as filenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
ama
n
o
Git
1
.
7
.
2-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
Me
r
ge
branch
'
ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Me
r
ge
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a few
m
or
e
fixes to
1
.
7
.
1
.
X s
e
r
i
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge
b
r
a
nch 'maint-1
.
6
.
4
' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe
Kleine-Köni
g
rev-parse:
fix --parse-op
t
--keep-dashdash
-
-
st
o
p
-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hama
n
o
Merg
e
b
r
anch 'mg/doc-rev-parse-tre
e
path-synt
a
x
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Ha
m
ano
M
e
rge br
a
nch 'tr/receive-pack-aliased-update
-
fix'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
ierre H
a
b
ouz
i
t
fix git bran
c
h -m in
p
resence of cross devic
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Cas
e
y
t/t0006:
spe
c
ify t
i
mezone as EST5 not EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
m
a
no
do not
w
rite out ind
e
x w
h
en status does not have
to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Voi
g
t
ad
d
missing && to submodule-merge testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next