repo.or.cz
/
git
/
jnareb-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
Jonatha
n
Nieder
merge
s
cript: ref
u
s
e to merge
d
uring m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
merge
s
c
ript: twe
a
k unmerged files mes
s
age to m
a
t
ch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
m
erge scri
p
t: --squas
h
,
-
-ff from unborn bra
n
ch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
f
m
t-m
e
rge-msg -m
t
o
o
v
errid
e
merge
t
it
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge-base --indepe
n
dent to
p
ri
n
t reduced
p
a
rent
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
merge-base --octopu
s
t
o
mimic show-branch --merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
Do
c
um
e
ntation: add a SEE A
L
S
O section for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nie
d
er
t620
0
(fmt-merge-msg
)
: style nit
p
icks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t6010 (merge-base):
m
odernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t
760
0
(merg
e
): test merge from branch yet to
b
e born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merg
e
): c
h
eck
r
efl
o
g entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t7600 (
m
e
rge): do not l
a
unch gitk for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than
N
i
ede
r
t7600 (m
e
rge): moder
n
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge
:
do not mistake
(
an
c
estor of
)
tag
f
or branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
no
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C H
a
m
ano
te
s
ts: correct
"
does reflog exist?"
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
Casey
t/
:
work around o
n
e-
s
hot varia
b
le assignment w
i
th test_mus
t
_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/README: correct an exception when br
e
ak
i
ng a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t/{t5541,lib
-
httpd}: r
e
p
l
ace p
r
ob
l
ematic '
!
(
)' notatio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t/t3700: convert
t
w
o uses
o
f ne
g
a
t
ion operato
r
'!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Haman
o
M
erge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/RE
A
DME: clarify test_must_fail des
c
riptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check
size of
path b
u
f
fer b
e
fore writ
i
n
g
i
n
t
o it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ra
l
f Thielo
w
update-ser
v
er-in
f
o: Shor
t
en read_pack_info_fi
l
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjar
m
ason
git add: Ad
d
--ign
o
re
-
m
i
ssing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
rnfjörð Bjarmason
g
i
t subm
o
dule a
d
d: Remo
v
e old do
c
s about
i
mplicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
ann
git submo
d
ule add: Req
u
ire the
n
ew --force
o
p
t
ion to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C
H
amano
Merge branch 'jl/ad
d
-n-ign
o
re-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
D
o
cum
e
ntati
o
n: Ex
p
la
i
n g
i
t
-
mer
g
etool's use of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
a
m
an
o
Merge branch 'jc/
d
i
f
f
-merge-base
-
multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only run aggrega
t
e
-
r
e
sults over
a
ctual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonath
a
n
N
ied
e
r
Add a sampl
e
user f
o
r the sv
n
dump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
i
o C H
a
m
a
no
diff A
.
.
.
B:
do n
o
t limit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
r
ge
b
ranch
'
jn/p
a
ginate-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge branch 'wp/merge-
t
ree-fix
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
erge br
a
nch 'j
s
/
merge-rr
-
f
ix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
c
h
'
jc
/
d
i
f
f-merg
e
-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Haman
o
Mer
g
e branch
'ns
/
merge-recu
r
sive-u
p
todate'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C
Hamano
Merge br
a
n
ch 'jn/t
e
sts'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e branch
'
eb/
d
o
c-
l
o
g
-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Merge branch 'jn/
g
rep-ope
n
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'mg/re
v
is
i
o
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h
'jk/
m
aint-statu
s
-keep-index
-
timestamp'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o
C
Hamano
Merge
branch 'jc/rebase-
i
-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
ge branch 'ab/submodule-add
-
f'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
branch 'bc/maint-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
Docu
m
entatio
n
: add submodule
.
* to the big configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
g
i
tmodules
.
5
:
url can
be a
r
e
l
ative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an Kumar S
u
nkara
gitweb: fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
d
e
r
gi
t
--paginate: paginate externa
l
c
o
mm
a
nds ag
a
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
M
ERGE
_
RR is in
.
git, not
.
git/rr-cach
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tree: fix where two
bra
n
ches
s
h
a
re no change
s
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
Hamano
G
i
t 1
.
7
.
2-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio
C
H
a
mano
Merge branch
'
jc/read-tree-
c
a
che
-
tree-
f
i
x
'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Har
i
nath
Us
e
dev_t for de
v
i
ce id (s
t
_dev) f
r
om stat in setup_git_
d
ire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: give
o
ne possible diff
w
h
en
there are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Jun
i
o C Ham
a
no
Merg
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
Held
git fetc
h
d
o
c
ume
n
t
a
ti
o
n: des
c
ribe
short '-p' s
y
nonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Mi
k
l
o
s Vajna
forma
t
-patch:
d
ocument the format
.
t
o configur
a
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehman
n
git add
:
Add the "--ignore-missing" option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Mich
a
el J Gruber
t
e
st-lib: TAP com
p
lian
c
e for skipp
i
n
g
test
s
o
n r
e
quest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
i
chael J Gr
u
ber
test-lib: s
i
mplify GIT_
S
KIP_TE
S
TS loo
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Juni
o
C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonat
h
a
n
Nieder
t3000
(ls-
f
ile
s
-o): modern
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documentation: Spelling fix in protocol-
c
apabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s S
e
b
recht
merg
e
-recursive:
use "up-to-date"
i
nstead of
"uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las Sebrec
h
t
checkout: ac
c
ord document
a
tion to what git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Joha
n
nes
Sixt
t0005: wo
r
k around strang
e
$? in k
s
h wh
e
n program terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
H
a
mano
Merge
r
emote
b
r
a
nch 'ko
/
m
a
ster' into jc/r
e
a
d-tree
-
cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
dif
f
.
c: fix a gr
a
ph
o
ut
p
ut bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð
B
j
a
rmason
t
e
sts
:
Use s
k
ip_all=*
to
s
ki
p
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio
C
Hamano
Fi
x
"
r
e
ad-
t
ree -m A B"
p
riming t
h
e ca
c
he-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
R
e
o
rgani
z
e `git-log' man page
t
o clarif
y
common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
N
a
zri R
a
m
li
y
grep -O: D
o
n
o
t pass color sequenc
e
s
a
s file
n
am
e
s to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C
H
amano
Git 1
.
7
.
2-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Merge
b
ranch 'ab/t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
i
o C H
a
m
ano
ba
c
kmerge a few m
o
re fixes t
o
1
.
7
.
1
.
X serie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge
branch 'maint-1
.
6
.
4
'
into m
a
int
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
rev-p
a
rse: fix
--parse-opt -
-
keep-dashdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge branch 'mg/do
c
-
r
e
v
-parse-tree
p
a
t
h
-
syntax' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
a
m
a
n
o
Merg
e
branch
'tr
/
re
c
eive-pack-ali
a
sed-update-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
erre Habo
u
zit
f
ix git branch -m in pre
s
ence
o
f
c
ross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Case
y
t/t0006: specify timez
o
ne as
E
S
T5 not ES
T
to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do not w
r
ite out index when st
a
tus does
n
ot have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Haman
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add m
i
ssing && to su
b
module-merge testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than Nieder
t/README
:
document more t
e
st helpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Case
y
Makefil
e
: work ar
o
und k
s
h's failure to handle mis
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Je
f
f King
t
e
st-date: fix
ssc
a
nf type conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Reid
xdiff: optimise f
o
r
no whitespace dif
f
erence when
i
gnorin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio C H
a
mano
rebase-i: do n
o
t g
e
t fooled by a
log message ending
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Haman
o
rebas
e
-i:
style fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
D
o
cumentation: li
n
k to
g
i
trevis
i
ons rather t
h
a
n git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
M
i
chael J
G
ruber
Docu
m
enta
t
i
o
n: gitr
e
visi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Mic
h
ael J Gruber
Do
c
umentation: split o
f
f rev
d
oc into i
n
clude file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next