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: --squash, --ff from unborn branch are errors
2010-08-18
Jonathan Nieder
merge script: --squash,
-
-ff f
r
om
u
nborn branch ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fmt-mer
g
e
-msg -m to
o
ver
r
ide
m
erge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge-bas
e
--
i
nde
p
endent to print reduced
parent
l
i
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge-b
a
se -
-
octopus to mimic show-branch --
m
er
g
e-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
Docum
e
nta
t
ion: ad
d
a SE
E
ALSO
s
ecti
o
n for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6
2
00 (fmt-merge
-
m
s
g): style nit
p
icks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t6010
(
merge-base):
m
odernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7
600 (me
r
ge): test merge
from br
a
nch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(merge): check ref
l
og entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t
7
600 (
m
erge):
do n
o
t launch
gitk for
-
-debu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
eder
t7600 (merge): modernize st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Ni
e
der
merge: do not mist
a
ke (ancestor
o
f) tag f
o
r
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
amano
Gi
t
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
io C Hamano
tests:
corr
e
ct "does reflog exist
?
"
t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brando
n
Casey
t/: work around on
e
-shot
va
r
iable assignment with test_m
u
st
_
f
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
N
ieder
t/
R
E
ADME: c
o
rre
c
t
a
n excep
t
ion
w
hen break
i
n
g
a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,li
b
-httpd}: replace problematic
'!()' notatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/
t
3700: c
o
nvert t
w
o uses of
negation
o
perator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Juni
o
C
Haman
o
Merge br
a
n
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/
READM
E
:
c
larify test_must
_
f
a
il descript
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
r
e
g Br
o
c
kman
Check size of path
b
uffer befo
r
e wri
t
in
g
into
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielo
w
upd
a
te-server-inf
o
: Shorte
n
r
ead_p
a
c
k
_info_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bja
r
mason
git add: Add --igno
r
e-mi
s
sing to SYN
O
P
S
IS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
r
n
f
j
örð Bjar
m
ason
git
s
ubmodul
e
add: Remove old docs about
i
m
plic
i
t -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehma
n
n
git submodule add:
R
equir
e
the new --force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
Hamano
Merg
e
bran
c
h
'jl/
a
dd-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d
Aguilar
Docu
m
entation: Explain git-mergetool's use
o
f temp
o
ra
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
Merge branch 'jc/diff-merge-b
a
se-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
homas Rast
Only run a
g
gregate-results
o
ver actu
a
l co
u
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Niede
r
A
dd a samp
l
e user for the svndump
l
ibr
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Ha
m
ano
diff A
.
.
.
B: do
n
o
t limit
the s
y
ntax too
n
arr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nc
h
'jn/paginate-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Me
r
g
e
b
ranch '
j
s/mer
g
e-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
e
rge branch
'
jc
/
diff-merge-
b
ase-multi'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ham
a
no
Me
r
ge branch 'ns/merge-rec
u
rsive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge br
a
nch 'jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
M
erge b
r
a
nch '
e
b
/
doc-l
o
g-m
a
npage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jn/gre
p
-
o
p
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge bran
c
h 'mg
/
r
evision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
br
a
n
ch '
j
k
/maint-status
-
keep-index-t
i
mestamp'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ham
a
no
Merge b
r
anc
h
'jc/reb
a
se-i-commit-m
s
g-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
amano
Merge
b
ranc
h
'ab/submodu
l
e-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
ama
n
o
Merge branch 'bc/maint-mak
e
file
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
eder
Documen
t
a
t
ion: add submodule
.
* to the big configura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nie
d
e
r
gitmodules
.
5: url can
b
e a re
l
a
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
a
n
Kum
a
r
Sunkara
gitweb: fi
x
esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
tha
n
Nieder
git --paginate
:
paginate external comma
n
ds again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffia
n
MERGE_RR
i
s in
.
git,
n
ot
.
git/
r
r
-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
Palm
e
r
m
erge-tr
e
e:
f
ix whe
r
e two branches s
h
a
re no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wi
l
l Palmer
add basic tests for merge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Juni
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 branc
h
'jc/
r
e
ad-
t
ree
-
c
a
che-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use dev_t for
d
evice id (st_dev
)
from
s
tat in
set
u
p_git_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Ju
n
io C Hamano
diff A
.
.
.
B: give one pos
s
ib
l
e
diff when th
e
r
e
are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Haman
o
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git
f
etch docum
e
ntation: describe short '-p' synon
y
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajn
a
for
m
at-pa
t
ch: document
the format
.
to configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens L
e
hman
n
git add: Add the "
-
-ignore-missing" opt
i
on for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
a
el
J
G
r
uber
test-
l
ib: TAP c
o
mp
l
iance for skip
p
i
n
g tests on reque
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
h
ael
J Gruber
tes
t
-lib: sim
p
li
f
y GI
T
_SKIP_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 Nieder
t300
0
(ls-files -o)
:
modernize sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik
S
k
olmli
Docume
n
tation: Spelling fix in proto
c
ol-c
a
pabilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
icol
a
s Sebrec
h
t
mer
g
e-recursi
v
e: use
"up-to-date"
instead of "u
p
todate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
checkout: acc
o
rd doc
u
mentat
i
on
t
o
w
hat git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johanne
s
Sixt
t
0005: work around strange $? in ksh w
h
en program term
i
nated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge remo
t
e branch 'ko/master
'
into j
c
/
read-tree-c
a
c
he
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c:
f
i
x a graph output
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Ar
n
fjör
ð
Bjarmason
t
e
sts:
U
se ski
p
_al
l
=* to ski
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix
"r
e
ad-tree -m A B" primi
n
g the cac
h
e-
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
R
eorganize `gi
t
-lo
g
' man pag
e
to clari
f
y common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Naz
r
i
Ramli
y
grep -
O
: Do not pass color sequences
as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Gi
t
1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merge br
a
nch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C H
a
mano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a few more fixes t
o
1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge
branch 'main
t
-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe K
l
e
i
ne-König
r
e
v-par
s
e:
f
i
x
--parse
-
o
pt --ke
e
p-dash
d
ash --stop
-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'mg/doc-rev-p
a
rse-tree
p
a
th-sy
n
t
a
x' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge branch 'tr/rece
i
ve-pack-aliased-update-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habouzit
f
i
x
git branch -m
i
n pres
e
nce of cross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bra
n
don Casey
t
/t0
0
06
:
specif
y
timezone as E
S
T5
n
o
t
EST t
o
com
p
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
do not write out index when sta
t
us
does
not
have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
Merg
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Voigt
add missing && to submodule-merg
e
t
e
stcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/README: d
o
c
u
m
e
n
t
more tes
t
hel
p
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
Makefile:
work aro
u
nd ksh's failu
r
e
t
o handle
mi
s
sing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
tes
t
-date: fix s
s
ca
n
f type
c
onversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
Ha
m
ano
Mer
g
e bra
n
ch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdif
f
:
optimise
f
or no whitespace
difference when ignori
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
u
n
io C Hamano
reb
a
se-
i
: d
o
not get fooled by a lo
g
me
s
sage ending
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
H
a
m
ano
r
ebase-i: styl
e
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mi
c
hael J Gruber
Documentation: lin
k
t
o gitr
e
visi
o
ns ra
t
her tha
n
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Micha
e
l
J Gruber
Documentation
:
g
i
tr
e
visions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael
J
Gruber
Document
a
t
i
o
n
: split off rev doc i
n
to i
n
cl
u
de f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jakub Narebski
gitweb: Move ev
a
lua
t
e_gitweb_confi
g
out of ru
n
_
r
eq
u
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
parse_date: fix signednes
s
i
n
t
i
m
e
zo
n
e calcul
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next