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
Jonathan
Ni
e
der
merge scr
i
pt:
refuse to merge during merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: tweak unmerged files messa
g
e t
o
mat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
de
r
merge sc
r
ipt: --s
q
u
ash, --ff
f
rom
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 override merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nieder
merge-base --independent t
o
print
red
u
ced
parent li
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n Nied
e
r
mer
g
e-base --octopus
to mimic show-branch
--merg
e
-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
Doc
u
mentation
:
add a SEE ALSO sect
i
on for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
Nieder
t6200
(
fmt-m
e
rge-msg)
:
sty
l
e nit
p
icks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t6010 (me
r
ge-base): mo
d
ernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): test
m
e
rge from branch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
t7600 (merge): check
reflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t7600
(
m
e
rg
e
): do not lau
n
ch
g
itk for
-
-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
t
7
600 (
m
erge
)
:
m
od
e
rnize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge: d
o
not
mis
t
ake (ancestor of) tag for br
a
nch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C Hamano
G
i
t
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o C Hamano
tests: correc
t
"does reflog
e
xi
s
t
?
" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
C
a
sey
t
/
:
work around one-s
h
ot
v
ariabl
e
a
s
s
ignment
with tes
t
_mus
t
_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jona
t
han Nieder
t/REA
D
ME:
c
orrect
an exce
p
tion when breaki
n
g a
&&
chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon
C
asey
t/
{
t
5
5
4
1,l
i
b-ht
t
p
d}
:
re
p
lace pr
o
ble
m
ati
c
'!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n Casey
t/t3700:
c
o
nvert tw
o
uses of negatio
n
operat
o
r '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
C
a
sey
t/READM
E
:
c
larify
test_must_fa
i
l
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
B
rockman
Check siz
e
of path bu
f
fer be
f
ore
w
riting in
t
o
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thiel
o
w
upd
a
te
-
server-info: S
h
orten read_pack_info
_
f
ile()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
Arnfjörð
B
jarmason
git add: Add --
i
gnore-missi
n
g to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arnfjörð Bj
a
rmason
git s
u
bmodul
e
add: Rem
o
ve
old docs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submodule
a
d
d: Req
u
ire the
new --fo
r
ce option
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
Hamano
M
erge branch
'
jl/ad
d
-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Agu
i
lar
D
o
cumen
t
atio
n
: Expl
a
in git-mergetool
'
s
u
s
e
of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Me
r
ge branch 'jc/diff-me
r
ge
-
b
ase-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
Rast
Only run aggr
e
g
a
te-r
e
sults over actual cou
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonath
a
n
Nieder
Ad
d
a sample us
e
r for the svndu
m
p library
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 syntax
t
oo narrowl
y
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C
Hama
n
o
Merge branc
h
'j
n
/paginate
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge branch
'
wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ha
m
ano
Merg
e
branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-
m
erge-
b
ase-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge br
a
nch 'ns/merge
-
recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C H
a
mano
Merge
br
a
nch 'jn
/
tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
r
anch '
e
b/doc-
l
og-m
a
npag
e
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Mer
g
e br
a
nch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o
C Hamano
Merge branch
'm
g
/revi
s
ion-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merg
e
branch 'jk/maint-
s
t
atus
-
keep-index-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Me
r
ge branch 'jc/re
b
ase-i-co
m
m
i
t
-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Me
r
ge branch 'ab/
s
u
b
modul
e
-add-f'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C Hamano
Mer
g
e branch '
b
c/maint-makefile
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Me
r
ge bra
n
ch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
e
de
r
Documentatio
n
: ad
d
submodule
.
* to the b
i
g c
o
nfigur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodules
.
5
:
url ca
n
be a relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkara
gitwe
b
: fix esc
_
u
rl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonatha
n
N
ieder
git --paginate: p
a
ginate
external c
o
mm
a
n
d
s a
g
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
fian
M
ERG
E
_RR is in
.
git, not
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
merge
-
tree: fix where tw
o
b
ranches
sh
a
re no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basic tests for merge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
H
a
mano
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/read-tree-cache-tree-fi
x
'
commit
|
commitdiff
|
tree
2010-07-14
Raja R H
a
rinath
Use d
e
v_
t
for device
id (
s
t_dev) f
r
om stat in se
t
up_g
i
t_di
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Hama
n
o
diff
A
.
.
.
B: give one possibl
e
diff when there are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
Held
gi
t
fetch docu
m
enta
t
ion: describe
s
hort '-
p
' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos Vajna
format-patch: document th
e
format
.
t
o configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehm
a
nn
git add: A
d
d
the "--ignore-mi
s
sing"
optio
n
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
c
hael J Gruber
tes
t
-lib:
T
A
P compli
a
nce f
o
r
s
k
i
pping test
s
on requ
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-l
i
b: simplify GIT_SKI
P
_TESTS
lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Ha
m
a
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (ls-
f
il
e
s
-o): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documentation: S
p
elli
n
g
fix
in protocol-capabiliti
e
s
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
icolas Sebrecht
mer
g
e-recursive: use
"up-to
-
d
ate" instead of
"
uptodat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
i
cola
s
Sebrecht
checkout: ac
c
ord
d
ocu
m
enta
t
ion
to
w
hat
g
it
do
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Jo
h
annes Sixt
t00
0
5: wo
r
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 Hamano
Merge r
e
mote br
a
nch 'ko/master' into jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Y
ang
di
f
f
.
c:
fix a g
r
aph ou
t
put bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar
Arnfjörð Bjarmason
tests: Use skip_
a
ll=* to skip
te
s
ts
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" priming the c
a
ch
e
-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
Bar
z
ilay
Reo
r
ganize `git
-
l
og' man page to clarify common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
g
rep -O: Do not pass color sequen
c
es as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
Haman
o
G
i
t 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'ab/ta
p
'
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
backmer
g
e
a
f
ew mo
r
e fixes to 1
.
7
.
1
.
X
s
e
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io
C Hama
n
o
Mer
g
e branch 'maint-1
.
6
.
4
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Klei
n
e
-
König
rev-p
a
r
s
e: fix --parse
-
opt -
-
keep-dashdash
--s
t
op-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merge
b
r
anch
'mg/d
o
c-rev-pa
r
se-treepath-
s
yn
t
ax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio
C H
a
ma
n
o
Merge
b
r
anch '
t
r/re
c
eive-pack-al
i
ase
d
-up
d
ate-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pier
r
e H
a
b
ouzit
fix git
b
r
anch
-
m
in presence of cross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bra
n
d
o
n Ca
s
e
y
t
/t0006: specify time
z
o
ne as EST5 not EST to
c
omply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hama
n
o
do no
t
write o
u
t inde
x
when status does
not
h
ave to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
ad
d
missing && to
s
ubmo
d
u
l
e
-merge testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan N
i
eder
t/RE
A
DME: document more
t
est helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
r
ando
n
Case
y
M
akefile: work a
r
ound
k
sh's failure to
hand
l
e
missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff
K
ing
t
est-d
a
te: fix
sscanf
t
ype conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Ham
a
no
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dy
l
an Reid
x
d
if
f
: optimis
e
for no whitespace
difference
w
h
en
i
gnoring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Ha
m
ano
rebase-i: do not
get fo
o
led
b
y
a log messag
e
en
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Hamano
r
ebase
-
i: style fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mic
h
ae
l
J Grube
r
Docu
m
e
ntation: link to gitrev
i
sions rather than git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mic
h
ae
l
J
G
r
uber
Documentation: gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J Gruber
Docum
e
ntati
o
n: split off rev doc i
n
t
o
i
nclu
d
e file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next