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 Nied
e
r
merge
s
c
ript: refuse to
m
erge during merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
N
i
ede
r
merge script: tweak u
n
m
erged
f
iles message to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
m
e
r
g
e script: --squash, --f
f
from unb
o
rn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
der
fm
t
-merge
-
msg -m
t
o ov
e
r
r
id
e
m
er
g
e title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Ni
e
der
merge-base --
i
ndepend
e
nt
t
o print
reduc
e
d parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Niede
r
merge-base --octopus to mimic
show
-
bra
n
ch --merge-bas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than
N
ieder
Documentati
o
n
:
a
dd a SEE ALSO section for merge-
b
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
d
er
t6200 (fmt-m
e
rg
e
-
msg): style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t
6
010
(merge-base):
m
o
d
e
rni
z
e
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (
m
erge): test m
e
rge from branch ye
t
to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7
6
00 (m
e
rge): check
reflog
entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge
)
: do not launch gi
t
k for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nieder
t
7
600 (mer
g
e): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
merge:
d
o
not mistak
e
(ancestor of) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
Hamano
G
i
t
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hama
n
o
tests: co
r
rect "does reflog
e
x
ist?" tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon C
a
sey
t/
:
work aroun
d
one-
s
h
o
t
variable assignment with
t
est_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/R
E
A
DME: cor
r
ect an
e
xc
e
p
t
i
on
wh
e
n breaking a &&
chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon
C
a
sey
t/{t5541,lib-httpd}: replace problematic
'
!()' notat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t/t3700: convert t
w
o
u
ses of negation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hama
n
o
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/REA
D
ME: clarify test_must_fail descrip
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg
B
rockman
C
h
eck size of path buffer bef
o
re writi
n
g into 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
Ra
l
f Thi
e
low
update-s
e
rver-info: Sh
o
rten read_pack_info
_
f
i
l
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
B
j
a
rmason
git
a
dd: Add -
-
ignore-missing
t
o SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
rð
Bjar
m
ason
git submodule add: R
e
mo
v
e
ol
d
docs about
i
mpli
c
it -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehm
a
nn
git sub
m
odule add: Require the new --
f
orce option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hamano
M
erge b
r
anch 'jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Documentation: Expla
i
n
g
i
t-mergetoo
l
's
u
se of tem
p
orary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hama
n
o
Merg
e
branch '
j
c/diff-merg
e
-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Th
o
m
a
s Rast
Only run aggregate-resul
t
s over a
c
tu
a
l
c
ounts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a sample user for t
h
e svnd
u
mp library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
diff A
.
.
.
B
:
do
not limit the syn
t
ax too narrowl
y
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Haman
o
Merge branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hama
n
o
Me
r
ge branch
'
wp/mer
g
e-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Me
r
ge
b
ranch 'js/merge-rr
-
f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ran
c
h
'jc/di
f
f-merg
e
-base-multi
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge bran
c
h 'ns/mer
g
e-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Me
r
ge branch 'jn/t
e
sts'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C H
a
mano
Merge branch 'eb/do
c
-
log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
M
e
r
ge
b
r
a
nch
'
jn
/
grep
-
open'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
M
e
rg
e
bran
c
h 'mg/revi
s
ion-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'j
k
/maint-sta
t
us-k
e
e
p
-
index-time
s
tamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge br
a
nch 'j
c
/rebase
-
i-co
m
mit-msg-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge branch 'a
b
/s
u
bm
o
dule
-
add-f'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
er
g
e
b
ranch 'bc/mai
n
t-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ham
a
no
Merge bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan
N
ied
e
r
Documenta
t
ion
:
add
s
u
b
m
o
dule
.
*
to the bi
g
configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
onath
a
n N
i
eder
git
m
odules
.
5
:
url
c
an
be a relative
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an Kumar Sunkara
gitweb: f
i
x esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Nieder
git --paginat
e
: pag
i
nate ex
t
ern
a
l
c
omm
a
nds ag
a
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Ja
y
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
i
ll Palmer
merge-
t
ree:
fix
w
here two br
a
nches share no
c
h
a
nges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
lmer
add ba
s
ic tests fo
r
merge
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hama
n
o
Git 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hama
n
o
M
e
rge branch 'j
c
/re
a
d-tree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raj
a
R Harina
t
h
Use
d
ev
_
t
f
or device id
(st_dev) from stat
i
n setup_git_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff
A
.
.
.
B: give one possible diff when ther
e
are
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hama
n
o
Merge bra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
2010-07-13
Oren
Hel
d
git
fetch docum
e
ntat
i
on: describe
short '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos Vajna
format-patch: document the for
m
at
.
to configurat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add
:
Add the "--ignor
e
-
m
issing" option
for
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
i
chael J Gr
u
b
er
test-lib: TAP compliance
for skipping tests
o
n
req
u
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
icha
e
l J G
r
u
ber
test-
l
ib
:
s
i
mplify 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
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonath
a
n Nieder
t30
0
0
(ls
-
files -o): modernize
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fr
e
drik Skolmli
Docu
m
entation: S
p
e
l
ling
f
i
x
in protocol-capabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
merge-recursive: us
e
"up-to-date"
instead of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
chec
k
out: a
c
c
or
d
documen
t
at
i
o
n
to what
g
it does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
oh
a
nnes Sixt
t
0
005: wo
r
k around strang
e
$? in ksh when
p
rogram
t
erminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio C Ham
a
n
o
M
e
r
ge
remote branch
'
k
o/master' into j
c
/read-tre
e
-
cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Yan
g
diff
.
c:
f
ix a
g
raph output
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð
B
jarmason
tests: Use skip_all=* to ski
p
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "re
a
d-tre
e
-m A B" priming the cache-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
li Bar
z
i
lay
Reo
r
ganize `git-log' man page to clarify common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazr
i
R
a
mliy
g
r
ep -O: Do not
p
ass
c
olor se
q
uences as filena
m
es to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
ni
o
C H
a
mano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
Merge branch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
back
m
erge a few more f
i
xes t
o
1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
un
i
o C H
a
man
o
Merge
branch 'm
a
int-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uw
e
K
lein
e
-König
rev-pars
e
: fix --parse-opt --keep-dashdash --stop
-
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o
C Hamano
Merge branch 'mg/d
o
c
-rev-parse-treepath-s
y
ntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C
Hamano
Merge branch
'tr/
r
e
c
eive-pack-aliased-update-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habouzit
fix
git
branch -m in presen
c
e
of cr
o
ss
devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Br
a
ndon Casey
t/
t
0006: speci
f
y timezone as EST5 not EST
t
o c
o
m
p
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
ama
n
o
d
o n
o
t
w
rite out index
when status does not have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C H
a
mano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Vo
i
gt
add missing && to submodule-merg
e
testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
o
nathan Nieder
t/R
E
ADME: document
more test he
l
pers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
B
randon Case
y
Makefile
:
w
o
rk around ksh's
failu
r
e to ha
n
dle m
i
ssing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
e
ff King
t
est
-
date: fix sscanf
t
ype co
n
ve
r
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
u
nio C Hamano
Merge branc
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdiff:
o
ptimise for no whit
e
space difference whe
n
ignoring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
reba
s
e-i: d
o
n
ot get fool
e
d
by a
l
og
message endin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Juni
o
C Hamano
r
eba
s
e-i:
s
ty
l
e
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Documentatio
n
: l
i
nk to gitrevisions rather than git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
M
ichael J G
r
u
b
er
Documentation: gitrev
i
sions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Documentation:
split o
f
f rev doc into in
c
lude file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next