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
MinGW: avoid collisions between "tags" and "TAGS"
2010-08-22
Jon Seymour
detached-stash: refactor git s
t
ash pop imp
l
e
ment
a
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n
Seymour
detached-stash
:
simpl
i
fy stash_drop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon
S
eymo
u
r
de
t
ached-stas
h
: simplify s
t
ash_apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
detac
h
e
d-stash: work around
git rev-p
a
rse failure to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jo
n
S
e
ymo
u
r
deta
c
h
e
d-sta
s
h: introduce
p
arse_fla
g
s_an
d
_revs functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
M
e
r
ge
branch 'mm
/
rebase-i-exec'
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Merge bran
c
h
'gb/split-cmdl
i
ne-er
r
m
s
g
'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
M
erge branch
's
o
/
h
ttp-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Merge br
a
nch 'mm/shortopt-detac
h
e
d'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o
C Hamano
Merge
b
ranch 'sr/local
-
config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
H
a
m
ano
M
e
rg
e
branch 'nd/fix-spa
r
se-
c
heckout
'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Hamano
M
e
rge
branch 'hv/submodule-find-ff-m
e
rge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
M
erge branch 'e
n
/
r
ebase-against-rebase-fix
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
mano
Merge branch 'dg
/
l
o
cal
-
mod-
e
rro
r
-messages'
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Merge br
a
nch 'p
o
/u
s
erdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C
H
amano
M
e
rge branch 'ab/p
e
r
l-
i
nstall'
commit
|
commitdiff
|
tree
2010-08-22
Æv
a
r
Arnfjörð Bjarmas
o
n
reset: suggest what to d
o
upon "git reset --mixed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C
H
a
m
a
no
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jonathan N
i
eder
apply: handle
traditional pat
c
h
es with space in fil
e
nam
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Ni
e
der
tests: exe
r
ci
s
e "
g
i
t apply"
with weird
f
ilenames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
apply: sp
l
it quoted filename handling into n
e
w
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
ens Lehm
a
nn
t7403: add missing &&'s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Te
l
l ign
o
re file abo
u
t g
e
nerate files in /gi
t
web/static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jeff Kin
g
docs: fix Makefile de
p
e
n
denc
y
for user manua
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove st
r
ay bac
k
slash
in show-
b
r
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
e
der
Docu
m
entation: remove
s
tray backslashes from "Fi
g
hting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Niede
r
Documentati
o
n
:
d
o not convert
.
.
.
operator to el
l
ips
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan
Nieder
Do
c
u
m
e
n
tation: avoi
d
stray backslash in user
m
anual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
a
than N
i
eder
Docu
m
entatio
n
:
av
o
id
s
tray backslashes in co
r
e tuto
r
ia
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Ni
e
d
e
r
Documentation
:
remo
v
e
stray bac
k
slas
h
es in rev-
p
a
r
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n Nieder
Docu
m
e
n
tati
o
n
:
r
e
m
o
ve
backslash before
~
in fast-import
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Documentation:
r
emove
stray backslash from
"
git bundle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
c
umentation/technical: av
o
i
d
stray backslash in pars
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
Doc
u
m
entati
o
n: remove backs
l
ashes
in manpage sy
n
opses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nied
e
r
Documentation: clarify quoting in gitignore docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
e
der
Documentatio
n
: clar
i
fy q
u
oting i
n
"gi
t
rm" examp
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Doc
u
mentation
:
add missing q
u
otes to "git
g
r
ep" examp
l
e
s
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han N
i
eder
D
o
cumentation: cla
r
ify quo
t
ing i
n
"git
a
dd" example
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
atha
n
N
i
eder
Docum
e
ntation: un
b
reak rege
x
in show
-
r
ef manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Doc
u
me
n
ta
t
ion:
quoting trouble
i
n
"
g
it rm"
d
iscuss
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nieder
Document
a
tion: tweak d
e
scr
i
p
t
ion of lo
g
.
d
ate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Bailey
mer
g
eto
o
l: Remove expli
c
it references to /
d
ev/tty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
a
n
o
Merge
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-20
J
u
n
io C H
a
mano
Merge branch 'jc/maint-follow-ren
a
me-fix' i
n
to
main
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ham
a
no
Merge branch 'j
n
/
m
ai
n
t-plug-leak' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merg
e
bran
c
h 'jn/fix-
a
bbrev' into
mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Mer
g
e branch 'vs/doc-s
p
ell'
into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge
branch '
j
n/reb
a
se-r
e
nam
e
-am' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
a
n
o
Merge bra
n
ch 'jn/doc-pull' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
a
ma
n
o
M
erge bra
n
ch 'bc/use
-
m
ore-hardl
i
nks
-
i
n
-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Hama
n
o
Merge b
r
anch 'tr/rfc-r
e
set-
d
oc' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Ramk
u
mar Ra
m
acha
n
dra
builti
n
/c
h
eckou
t
:
F
ix message w
h
en s
w
itching to a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
t
h
an
Nieder
Doc
u
me
n
ta
t
i
o
n: set a !DOC
T
Y
P
E for user manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu
Moy
xmalloc: inc
l
ude size in the
fai
l
u
r
e mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elij
a
h Newren
merge-
r
ecursive: Avoid
e
xcessive output f
o
r a
n
d re
p
roc
e
ssing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Jun
i
o C Hamano
M
erge branc
h
'maint' to
s
ync with 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C
H
amano
Git 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ha
m
ano
Mer
g
e branch
'
tr/xsize
-
bits' i
n
to maint
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
M
erge branch 'jc/sh
a
1-name
-
find-
f
i
x' into maint
commit
|
commitdiff
|
tree
2010-08-19
Jonathan N
i
eder
autoconf: do
n
't use pl
a
tfo
r
m
regex if
i
t
l
a
cks REG_STARTEND
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Æ
v
ar Arnfjörð Bjar
m
ason
t/
t
7008-gr
e
p-binary
.
sh: un-TODO a test th
a
t need
s
REG
_
STAR
T
END
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ha
m
an
o
compat/regex: get rid of ol
d
-
s
tyle
d
efinitio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Æ
v
ar Arnfjörð Bjarmason
t/t9010-svn-f
e
.
sh: add
a
n
+x bit to
t
his te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Æ
v
ar
A
r
n
f
jörð
Bja
r
m
a
son
comp
a
t/regex: define out variables onl
y
us
e
d under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge br
a
nch 'sp/fix-smart-http-dea
d
lock
-
o
n
-
e
rror'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Fr
a
nk L
i
Change
r
ege
r
ror() declaratio
n
from K&R
style to
A
NSI
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var
Arn
f
jörð Bjarmason
co
m
pat/regex: get the gawk regex engine t
o
com
p
ile
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
Arnfjörð Bja
r
mason
co
m
pat/regex: use
t
he
r
e
gex engine from gawk
f
or com
p
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
i
e
de
r
merge
s
cript: le
a
rn --[no-]rerere-autoupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge
scr
i
pt: notice @{-1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: handle --no-ff --no-commit
cor
r
ectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
merge s
c
ript: --ff-only to disallow tr
u
e merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: ha
n
dle many
-
way octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Ni
e
der
merg
e
scrip
t
: handle -m --log
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: forbi
d
m
e
rge
-
s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
ha
n
Nieder
merg
e
script: allow cust
o
m
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge scri
p
t:
m
erge
-X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
h
a
n N
i
eder
merge s
c
ri
p
t: i
m
pro
v
e log message subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
m
e
rge script: refuse
to merge duri
n
g merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript
:
tweak un
m
erg
e
d
files message to m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
mer
g
e script: --squash,
--ff fr
o
m unborn branch
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
t
itle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base
-
-i
n
depende
n
t
to print reduced par
e
nt list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
me
r
ge-
b
ase
--octopus
to mimic sho
w
-branch --
m
erge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Niede
r
Doc
u
men
t
ation: ad
d
a SEE ALSO se
c
tion
f
or merg
e
-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
der
t6200 (
f
mt-me
r
ge-msg): style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t6010 (merge-
b
as
e
)
: mo
d
ernize
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t
76
0
0 (me
r
ge
)
: test merge from branch yet to be
b
o
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t7600
(merge): c
h
eck
r
eflog
entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t7600 (merge): do not launch git
k
fo
r
--d
e
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
an Nieder
t7600 (merg
e
): mode
r
nize s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
m
erge: do
n
o
t
mistak
e
(ances
t
or of) tag f
o
r bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d
Aguil
a
r
s
u
bm
o
dule sync: Update "submodule
.
<
n
ame>
.
u
r
l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
a
r
Arnfjörð Bjarmason
tests:
f
ix syntax erro
r
in "Use
a
dvise() for h
i
nt
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge branch 'j
c
/maint-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'tf/str
i
n
g
-l
i
st-ini
t
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge b
r
anc
h
'cc/
f
ind-commit-subje
c
t
'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C
Ha
m
ano
cvs test
s
: do not touch test CVS repositor
i
es
s
hipped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjö
r
ð Bjarmason
t/
t
9602-cvsimport
-
branches-tags
.
sh: Add a PERL
p
rerequis
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjar
m
ason
t/t9601-cvsi
m
port-
v
e
n
d
or-branch
.
s
h: Add
a
PERL prereq
u
is
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next