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: merge -X<option>
2010-08-18
J
onathan Nieder
m
erge script: merge -
X
<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Nieder
merge
s
cript: impr
o
ve log
me
s
s
a
ge subj
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ieder
merge script: refuse t
o
m
e
rge
during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan
N
iede
r
merge scri
p
t: tweak u
n
m
e
r
g
ed files me
s
sa
g
e to
match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
merge script: --squash,
-
-ff
f
rom un
b
o
r
n
b
ranch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fmt-
m
erge-msg -
m
to ov
e
rride merge t
i
tle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge-base --indep
e
ndent t
o
print reduced par
e
nt list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
m
erg
e
-bas
e
-
-
o
c
t
opus
t
o mimic show-branch --merg
e
-
b
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
t
han Nieder
D
ocumentation: add a S
E
E ALSO sec
t
i
o
n for me
r
ge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge
-
msg):
style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t
6010 (merge-base): modern
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
ed
e
r
t7600 (merge): test merge fro
m
br
a
nch yet to be
b
o
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
d
e
r
t7600 (merge)
:
c
heck reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7
6
0
0 (merge
)
: do not launch
g
itk for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ed
e
r
t76
0
0 (m
e
rge
)
: mo
d
ernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do not
m
istake
(
a
n
cestor
o
f
) tag 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
Junio C H
a
mano
tests: co
r
rect "does
r
e
f
log exi
s
t?" te
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
n
d
on Casey
t/: work around one-shot variable assig
n
ment with t
e
st_mu
s
t_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jona
t
han Nieder
t/READM
E
: c
o
rr
e
ct an except
i
on when
breaking a
&
&
c
h
a
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
ra
n
don
Casey
t
/
{t5541,lib-httpd
}
: replace problematic '!()
'
no
t
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
s
e
y
t/t370
0
: conv
e
rt two uses of negat
i
on operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
un
i
o C Ha
m
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
Casey
t/
R
EA
D
ME: clarify
t
e
st_must
_
fa
i
l descripti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
G
r
eg
Brock
m
an
Check size o
f
pa
t
h buffer before wr
i
ting into
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hama
n
o
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf T
h
ielow
upd
a
te-server-info: Shorten read_pack_i
n
f
o
_
file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git a
d
d: Add --
i
gnore-missing to
SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar A
r
nfjörð Bjarmason
git submod
u
le add:
R
emove old
d
o
c
s about im
p
lici
t
-
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submo
d
ule a
d
d: Require the new -
-
f
orce opti
o
n to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
io C Hamano
Mer
g
e
b
r
an
c
h 'jl
/
add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
m
ent
a
t
i
on:
Explain git
-
mergetool
'
s
use of
t
e
mporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
Merge
b
ranch 'jc
/
diff-
m
erge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only r
u
n aggregate-results over actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Ni
e
der
A
dd a sample user
for
t
h
e svndump libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do n
o
t limit the
s
yntax too narr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merg
e
b
r
a
n
ch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Mer
g
e branc
h
'wp/me
r
g
e-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hama
n
o
M
e
rge
b
ranch 'js/merge-rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h '
j
c/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
g
e
b
r
anch 'ns/merge
-
recu
r
sive-uptod
a
te'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
amano
Merge
branch 'jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
Haman
o
Merge bra
n
ch
'
eb/doc
-
log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
M
erge b
r
a
n
ch 'jn/grep-
o
pen'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
man
o
M
e
rge b
r
a
nch 'mg
/
revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jk/maint-
s
tatus
-
keep-index-timest
a
mp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge b
r
anch
'
j
c/rebase-i-comm
i
t-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Me
r
ge
b
r
anch 'a
b
/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'bc/maint-m
a
kefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Ni
e
der
Docume
n
tation:
a
d
d sub
m
od
u
le
.
* to the b
i
g c
o
nfiguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an Nieder
g
itmodules
.
5
:
u
rl
can be a relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
Ku
m
a
r
Su
n
kara
g
i
tweb: fix es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
t
h
a
n
Nie
d
er
gi
t
-
-
pagina
t
e
: paginate external
commands ag
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE
_
RR is in
.
git, not
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
mer
g
e
-
tree: fi
x
where two
branc
h
es share
no chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
a
dd
b
a
s
ic tests for merge-
t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C
H
amano
Git 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C
H
amano
Merge bra
n
ch 'jc/read-tree-cache
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
a
j
a
R Ha
r
inath
Use dev_t for device id (s
t
_dev) from stat in
setup
_
git_dir
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
di
f
f A
.
.
.
B: give one possible diff when there
a
re more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
M
e
rge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-07-13
O
ren Held
g
it fetch
d
ocumentation: d
e
scri
b
e sho
r
t
'
-p' syno
n
y
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Mik
l
o
s Vajna
f
o
r
m
at-p
a
tch: document the format
.
to con
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add: Add
t
he "-
-
ignore-missing" optio
n
for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J
G
r
uber
test-lib: TAP compl
i
ance for skipping tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Grube
r
test
-
li
b
: simplify GIT_S
K
IP_TESTS
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
Ni
e
der
t3000 (ls-f
i
les
-
o): modernize
sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Docume
n
tatio
n
: Spel
l
ing
f
ix
i
n protocol-ca
p
abilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nico
l
as Sebrecht
merge-
r
ec
u
r
sive: use
"
up-to-d
a
te" instead of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
ebrecht
che
c
kout: acc
o
rd documentatio
n
to
w
hat git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes
S
i
xt
t
0
005: wor
k
around strange $?
in ksh when program terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hama
n
o
Mer
g
e remote branch '
k
o/maste
r
'
i
nto j
c
/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Y
ang
d
iff
.
c: fix a gr
a
ph
out
p
ut bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð Bj
a
rmason
t
e
sts: Use skip_
a
ll=* to
sk
i
p tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "
r
ead-tree -m
A
B" prim
i
ng the ca
c
h
e
-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
Barzilay
Re
o
rganize `git-log' man
p
age
t
o clarify common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazr
i
Ramli
y
grep -O: Do not pass co
l
or sequences as filena
m
es 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
Me
r
ge b
r
anch 'ab/
t
ap'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
backmerge a f
e
w more
f
ixes
t
o
1
.
7
.
1
.
X serie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
erge branch 'maint-1
.
6
.
4'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine
-
Köni
g
rev-parse
:
fix
--parse-
o
pt -
-
kee
p
-dashdash --stop-
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Haman
o
Merge branch 'mg/doc-rev-parse-treepath
-
syntax' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
a
m
ano
M
e
r
ge branc
h
'tr
/
rec
e
ive-pack-a
l
i
a
sed-update-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pi
e
rre Habouzit
fix gi
t
b
ranch -m in
p
resence of cross d
e
vi
c
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
on
C
asey
t
/t
0
006: spe
c
ify timezone
a
s EST
5
no
t
EST to
c
omply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do
n
ot write out index when
s
tatus does not have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merge b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Voigt
a
d
d missing
&& to submod
u
l
e
-mer
g
e testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than Nieder
t/
R
EADME: docum
e
nt more tes
t
helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
o
n Casey
Ma
k
efi
l
e
:
work around
k
sh's failure t
o
h
a
nd
l
e missing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
e
ff King
test-da
t
e
:
fix s
s
canf type co
n
v
ers
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
unio C Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-06
D
y
lan Rei
d
xd
i
ff: optimise f
o
r
no whitespac
e
differen
c
e when i
g
noring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hama
n
o
r
e
b
as
e
-i: do not g
e
t
fooled
b
y
a
log m
e
ssag
e
ending
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
unio C Haman
o
rebase
-
i: style fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Mi
c
h
ael J Gruber
Documentation: link t
o
gitrevisions rather than git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next