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: refuse to merge during merge
2010-08-18
Jonath
a
n Niede
r
merge
script: r
e
fuse to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
e
d
er
mer
g
e script: t
w
eak unmerged
f
il
e
s
m
essage to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
e
de
r
merge
s
cr
i
pt: --squash, --ff
f
rom unborn
br
a
nc
h
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m to override merge tit
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Niede
r
merge-
b
ase --independent to print re
d
uced p
a
rent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nied
e
r
merge-base --octop
u
s to
m
imic show-branch --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
Documen
t
a
tio
n
:
add a SEE ALS
O
section for mer
g
e-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): style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
6
010 (m
e
rge-base): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(
m
erge): t
e
st merge from branch ye
t
to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600
(
m
e
r
g
e): che
c
k
r
e
f
log entr
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do
n
o
t
la
u
n
ch git
k
for --de
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nieder
t7600 (
m
er
g
e): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do
not mista
k
e
(
anc
e
stor of) tag for branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C Hama
n
o
Git
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
te
s
ts: corre
c
t
"does ref
l
og exis
t
?
"
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
C
asey
t/: w
o
rk around one-sh
o
t varia
b
le assig
n
men
t
with tes
t
_
must_fai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
t
han Nieder
t/README:
c
orrect an excep
t
i
on when brea
k
ing a && chai
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Case
y
t/{t5541,lib-
h
ttpd}:
replace problematic '!()' n
o
t
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon Casey
t/t370
0
: c
o
n
v
ert tw
o
uses of negation op
e
r
a
tor '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C
Ha
m
ano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t/README
:
cl
a
rify test_must_fai
l
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
B
r
ockman
Check size
o
f path buffer befor
e
writing
i
nto
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upda
t
e-ser
v
er-info: Shorten
read_pa
c
k_info_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar A
r
nfjör
ð
Bj
a
rmaso
n
g
it add: Add --
i
gn
o
re-miss
i
n
g
to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
r
ð
Bjarmason
git subm
o
d
u
l
e
add:
Remov
e
ol
d
d
o
cs about impli
c
i
t
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
ann
git submodule add
:
Requi
r
e the ne
w
--fo
r
ce
o
ption to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merg
e
branch 'j
l
/add-n-ign
o
r
e
-miss
i
ng'
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Documentation: E
x
pl
a
in git-merg
e
too
l
's use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Haman
o
Merg
e
branch 'jc/di
f
f-merge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
O
n
ly run aggregate-results over actual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nieder
Add a sample user for the
s
v
n
dump l
i
brary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
i
o C Hama
n
o
diff A
.
.
.
B: d
o
not limit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ran
c
h 'wp/merge
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ha
m
ano
Me
r
ge
b
ran
c
h 'js/
m
erge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge
b
ranch 'jc/diff-merge
-
base-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
e
rge branch
'
ns/merge-recu
r
sive-uptod
a
te'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hama
n
o
Merge bra
n
c
h
'
j
n/t
e
sts'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge branch '
e
b
/doc-log-manp
a
ge'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge br
a
nch 'jn/gr
e
p-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
branch 'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
r
g
e branc
h
'
j
k
/mai
n
t-status-ke
e
p
-
inde
x
-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge branch 'jc/rebase
-
i-c
o
mmit
-
msg-
f
i
x
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge b
r
anch '
a
b/subm
o
dule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge bran
c
h 'bc/m
a
int-makefile-fixes
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation: add submodule
.
* to
t
he big con
f
i
g
uratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
eder
gitmo
d
ules
.
5:
url can be
a relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
P
avan Kumar
S
unk
a
ra
g
i
tweb: fix
e
sc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonath
a
n Nieder
g
i
t --paginate: pa
g
inat
e
external
c
o
m
mands
ag
a
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay
S
of
f
ian
MERGE_R
R
is
i
n
.
g
it, n
o
t
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
merge-t
r
ee: f
i
x where two bran
c
hes
s
hare no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basic tes
t
s for merge
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Ha
m
ano
Git 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
H
a
m
ano
Merge b
r
anch 'jc/read-tr
e
e-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R
H
ar
i
nath
Use
d
ev_t f
o
r
d
e
v
ice id (st_dev
)
fr
o
m sta
t
in setup_
g
it_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ha
m
ano
diff A
.
.
.
B: give
one p
o
ssible diff
w
h
e
n there are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
u
n
io
C
Hamano
M
erge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
O
r
en Held
gi
t
fe
t
ch doc
u
mentation: describe shor
t
'-p' synon
y
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Mi
k
l
o
s Vajna
format-patch: doc
u
m
e
nt
the
f
orm
a
t
.
to c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Je
n
s Lehmann
git add
:
Add the "--
i
gno
r
e-m
i
ssing"
opt
i
on for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
ch
a
el J Gruber
tes
t
-li
b
: TAP compliance for skippin
g
tes
t
s on reques
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
ael J Gruber
t
e
s
t
-lib: simplify
G
IT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jun
i
o C Hamano
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
n
athan Niede
r
t
3
000 (ls-
f
iles -o)
:
mo
d
ernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredri
k
Skolmli
Do
c
u
m
entation: Spelling fi
x
in prot
o
col-c
a
pab
i
lit
i
es
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ni
c
olas Seb
r
e
cht
merg
e
-recursi
v
e
:
us
e
"up-to
-
date" ins
t
e
ad of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Se
b
recht
c
heckout
:
accord do
c
umentat
i
on to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Si
x
t
t0005:
work around strange $? in ksh when pr
o
g
r
am terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
H
aman
o
Merge
remote branch 'ko
/
master
'
into jc
/
read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c
:
f
i
x a graph output
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar
A
rn
f
j
örð Bjarmason
tests: Use skip_all=* to skip te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C Hamano
Fix "read-t
r
ee
-
m
A
B
"
prim
i
ng the
c
ache-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorganize `gi
t
-log' ma
n
page
t
o clarify common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
N
a
zri R
a
ml
i
y
gre
p
-O: Do
n
ot pass
co
l
or se
q
uences as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Git 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
m
ano
Merge branch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
M
e
rge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
a
mano
b
a
c
k
merge a few more fixes
to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
m
a
no
Mer
g
e br
a
nch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
r
e
v-parse: fix --parse-opt -
-
keep-da
s
hdas
h
--s
t
op-a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C
Hamano
Merge
branch 'mg
/
doc-rev-
p
ar
s
e-treepath-syn
t
ax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Merge branch
'tr/receive-pack-alias
e
d-upd
a
te-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
erre Habouzit
f
ix git bra
n
ch -m
i
n presence of
c
ross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
r
andon Casey
t
/t0006:
s
pecify timezone as EST5 not EST to
c
om
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do not write out ind
e
x when status does no
t
h
ave to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Ham
a
no
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add missing && to s
u
bmodule-merg
e
testc
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan
Nieder
t
/
README: docu
m
ent more
te
s
t
h
elpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
Casey
Mak
e
f
i
le
:
wo
r
k
around ksh's failure to handle
m
iss
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-da
t
e: fix
s
sca
n
f type conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
unio C
H
amano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdif
f
:
optimi
s
e for no whi
t
espace difference when ig
n
or
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Juni
o
C
Hama
n
o
rebase-i:
do not g
e
t fooled by a log message en
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
u
nio C Hamano
r
e
base-i
:
sty
l
e
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J Gruber
Documentation: link to gitre
v
isio
n
s r
a
ther than git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michae
l
J Gruber
Documentation: gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J Gruber
Documentation:
split off
r
ev doc int
o
i
nclud
e
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next