repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'en/d-f-conflict-fix'
2010-08-23
Juni
o
C Ha
m
ano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-08-22
Ralf Wild
e
nhues
T
y
pos in co
d
e
c
omments, an erro
r
messag
e
,
docume
n
ta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
R
a
lf Wi
l
denhues
Typos in c
o
d
e
com
m
ents, an error messa
g
e
, documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
autoco
n
f:
r
egex libra
r
y
detection typofi
x
commit
|
commitdiff
|
tree
2010-08-22
Ni
c
o
l
as Pitre
fix >4GiB source delt
a
assertion failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jon
S
eymour
det
a
ched-
s
tash: upd
a
te Documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jon
Seymour
detached-stash: tests
o
f gi
t
stash with stash-like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
detached-
s
tash: si
m
plify g
i
t stash s
h
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
on Seymour
deta
c
hed-s
t
ash:
sim
p
lify git s
t
ash branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
de
t
ached-
s
tash:
ref
a
ctor git stash pop
im
p
l
e
mentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n
S
e
ymour
detached-
s
t
a
sh:
s
implify stash_drop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n Seymour
detached-stash:
s
implify sta
s
h
_apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n
S
e
y
mour
detached-s
t
ash:
work a
r
ound
git rev
-
pars
e
failure to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n Seymour
detached-stash:
int
r
oduce par
s
e
_
flags_an
d
_r
e
v
s
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C H
a
m
ano
Merge branch 'mm/r
e
base-i-exec
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Merge b
r
anch 'gb/spli
t
-cmdline-errmsg'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
r
g
e branch '
s
o/http-us
e
r-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Hama
n
o
Merge branch
'
mm/shortopt-deta
c
hed'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hama
n
o
Merge branch 'sr/
l
oca
l
-
config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C H
a
m
ano
Merge branch
'nd/
f
ix-sparse-c
h
eckout'
commit
|
commitdiff
|
tree
2010-08-22
J
un
i
o C Hamano
M
erge branch 'hv/
s
u
b
module-find-f
f
-
m
erge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
e
rge bran
c
h
'en/
r
ebase-aga
i
nst-reb
a
se-
f
ix'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
Merge
b
ranch '
d
g/local-mod-erro
r
-messages'
commit
|
commitdiff
|
tree
2010-08-22
J
u
n
io C Haman
o
Merg
e
b
ranc
h
'po/userdiff-csh
a
rp'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Ham
a
no
Merge
b
ranch 'ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Ævar
A
rnfjörð
Bja
r
mason
re
s
et
:
sug
g
est wha
t
to do upon "git
reset --mixed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
apply: handle traditio
n
al patches with
space in filename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Ni
e
der
tests: exe
r
c
ise "git apply" with weird
f
ilenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonatha
n
N
ieder
apply
:
spl
i
t quoted fi
l
ename han
d
li
n
g i
n
to new function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
J
e
ns Lehmann
t7403: add mi
s
s
ing &
&
's
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell ignore fil
e
a
b
out generate files in /gitweb/s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
do
c
s: fix Makefile d
e
pendency for user manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan Nied
e
r
Documen
t
ation:
r
emove stray bac
k
s
l
ash in
sh
o
w-branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Documentatio
n
: rem
o
ve stray
backslashes from "Fighting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Ni
e
der
Do
c
umen
t
ation: do not co
n
vert
.
.
.
operator to
e
llipses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan
Niede
r
Document
a
tion: avoid stray backslash in user ma
n
ual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Docum
e
n
t
a
tion: avoid stray backsl
a
shes
i
n core tut
o
rial
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n
N
ieder
Documentati
o
n: remove stray back
s
lashes in
r
ev
-
parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nie
d
er
D
o
cum
e
n
tation: remove back
s
lash before ~
in fast-import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han Ni
e
der
Documentation:
r
emove stray backslash
f
rom
"git bundle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan
N
i
eder
Docu
m
entation/tech
n
ical: avoi
d
stray back
s
lash in parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nieder
Documentati
o
n:
remove bac
k
sla
s
hes in man
p
age
synop
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
h
a
n
Ni
e
der
Documentation: cl
a
rif
y
q
u
o
t
ing in gi
t
ignor
e
d
ocs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nieder
Documen
t
ation: clarify
q
uoti
n
g
in
"
git rm" ex
a
mple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Nied
e
r
D
o
cumentation: a
d
d missing quotes
to "git grep" examp
l
es
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nieder
Docum
e
n
tat
i
on: clarify quotin
g
in
"
git add" example
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nie
d
er
Documentation: unbreak
r
e
g
ex
i
n show-re
f
manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
e
d
er
Documen
t
at
i
o
n
:
quoting tr
o
uble in "
g
it r
m
"
discussion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nieder
Documen
t
ati
o
n:
twea
k
de
s
crip
t
i
o
n
of log
.
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remo
v
e expl
i
cit references to /dev
/
tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Hama
n
o
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'j
c
/maint-follow-rename-fix'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C Ham
a
no
M
e
r
ge branch 'jn
/
maint-
p
lug-leak
'
in
t
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
H
amano
Merge bra
n
c
h
'jn
/
fix-abb
r
ev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Merge branch '
v
s
/
doc-spell' into
maint
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io C Ham
a
n
o
M
e
rge br
a
nch
'jn/reba
s
e-rename-am'
i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C H
a
m
a
no
Merge branch
'
jn/doc-pull' into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-08-20
Juni
o
C
Haman
o
Merge
branc
h
'
b
c/use-more-hardli
n
ks-i
n
-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Mer
g
e branch 'tr/rfc-
r
eset-doc
'
into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Ramach
a
ndra
builtin/checkout: Fix message w
h
en sw
i
t
ching to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
at
h
an Nieder
Doc
u
m
entation: set a
!
DOCTY
P
E for
user
m
anual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu M
o
y
xmalloc: include size in the failure me
s
sa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Elij
a
h Newren
m
e
rge-recursive: Avoid excess
i
ve output for a
n
d reprocessing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Jun
i
o C Hamano
Me
r
ge bran
c
h 'maint
'
to sync with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
unio C Hamano
G
i
t
1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Juni
o
C
H
amano
Mer
g
e branch 'tr
/
xsize
-
bits
'
int
o
maint
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge bra
n
ch 'jc/sha1-name-fin
d
-
f
ix' into
maint
commit
|
commitdiff
|
tree
2010-08-19
Jonathan Nieder
autoconf:
d
on't
u
s
e
p
l
atform regex
if it l
a
c
k
s REG_STARTEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar
Arnfjörð Bjarmason
t/t7008-
g
rep-binary
.
sh: u
n
-TO
D
O a tes
t
t
h
at n
e
e
d
s REG_STARTEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ham
a
no
comp
a
t/regex:
get rid of ol
d
-style definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnf
j
ö
r
ð Bjarmason
t
/
t9010-svn-fe
.
sh: add
an +x bit to this test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar
A
rnfjörð Bjarma
s
on
comp
a
t/
r
egex: defin
e
out variable
s
only used under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
am
a
no
Me
r
ge br
a
nch
's
p
/fix-s
m
art-ht
t
p
-dea
d
lock-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Frank Li
Change reger
r
or() declaration fr
o
m K&R style to ANSI
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æv
a
r Arnfjörð
Bjarmaso
n
compat/regex
:
get the gawk regex
engine to co
m
pil
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var Arnfjörð Bj
a
rm
a
s
on
compat/regex: us
e
the rege
x
engine from gawk for compat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
Niede
r
mer
g
e sc
r
i
p
t: learn --[no
-
]r
e
re
r
e-autoupdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
merge scri
p
t
:
n
otice @{-1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge s
c
ript: handle --n
o
-ff
-
-no-commit c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge
sc
r
ipt:
--ff-only to
dis
a
llow t
r
u
e
m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
th
a
n Nieder
merge
s
c
r
ipt: hand
l
e many
-
w
ay octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge script: han
d
le -m --log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ied
e
r
m
er
g
e script
:
forbid me
r
ge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
iede
r
merge sc
r
ipt: allo
w
cu
s
tom strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
er
g
e script:
m
erge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
m
e
r
ge script: improve
log mes
s
ag
e
subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e script:
r
e
fuse
to m
e
r
g
e dur
i
ng merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nieder
m
erg
e
s
cript: tweak unme
r
ged files message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
merge script:
--squas
h
,
-
-
ff
from unborn
b
ranch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
der
fmt-merge-msg -m t
o
over
r
ide merg
e
titl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
natha
n
Nieder
merge-base --in
d
e
p
e
n
dent
t
o pr
i
nt reduce
d
pare
n
t
list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge-base
-
-
o
c
t
opus to
m
imic
show-bran
c
h
-
-m
e
r
ge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an Ni
e
der
Documentati
o
n:
add
a
SE
E
AL
S
O section for merge
-
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
t6200 (fmt-merge-msg): style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
er
t6010 (merge-
b
ase)
:
mod
e
r
n
ize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (me
r
g
e): test me
r
ge from branch
y
et
to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan N
i
eder
t7600
(m
e
rge):
c
heck
re
f
log entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t7600
(merge)
:
do not launch
g
itk for --d
e
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nied
e
r
t
7
600
(merg
e
):
m
odernize s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next