repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fixup.cc5711424b7ae36276a40c06ede5d95f87ca20f0
2010-02-07
Johannes Schindelin
fix
u
p
.
cc5711424b7ae36276a40
c
06e
d
e
5d
9
5f8
7
ca20f0
commit
|
commitdiff
|
tree
2010-02-07
J
ohan
n
es Schin
d
elin
fix
u
p
.
ca26a063e54e
1
2
5
b5cc5db
c
2b6e52393cc348cb7
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindeli
n
fixup
.
5d821843a21a88ac
0
f22c909025127ee37dc45ca
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
git
w
eb:
Syn
t
a
x highlig
h
ting suppor
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add
a
scr
i
p
t that rep
l
aces
corrupted objects with good
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
read-tree: Fix regression with
cr
e
a
tio
n
of
a ne
w
in
d
ex
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Schindelin
g
itk: w
o
r
k
around ridiculous co
m
mand line re
s
triction
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
annes Sch
i
ndelin
Merge cover
l
etter
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Exp
o
s
e
th
e
h
a
s
_n
o
n_ascii(
)
funct
i
on
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
Merge commit '84b65f54
e
a5ed2d044bc85880b452e5a5d2d8096
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Allow s
e
tti
n
g default
diff options via diff
.
defaultOptions
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es Schindelin
W
I
P:
g
rep --substitute <subst
i
tution>
<pa
t
te
r
n>
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindel
i
n
Intr
o
duce strbuf_re
g
sub()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
h
indelin
Merge clone
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s S
c
hind
e
l
in
clone
:
ignore
--depth w
h
e
n
c
loning locall
y
(im
p
licitly
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schinde
l
in
Teach t
h
e '--e
x
clu
d
e
'
opt
i
on to
'
diff --no-index
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
M
e
rge grammar
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
i
n
deli
n
Mino
r
grammar fix in the 'Not a git
repository' messa
g
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes S
c
h
i
ndelin
Merge commit 'push-into-h
e
ad'
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Sc
h
ind
e
li
n
Add a f
e
w more
v
alues f
o
r receiv
e
.
denyCurrentBranch
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
WIP:
E
nforce core
.
au
t
ocrlf=false for cvsimpo
r
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sch
i
n
d
elin
M
erge reb
a
se-i-p
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schind
e
li
n
TODOs for rebase -i -p
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
reba
s
e -i -p 'merge': if the mer
g
e message is omitted
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schind
e
lin
t3413: use REBASE_SC
R
IPT for
bookmark test (WIP: merg
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
t/lib-reba
s
e
.
sh:
let
f
a
ke
_
editor
c
ompletely rewrit
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
nde
l
in
r
e
base-
i
: TODO
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
WIP: Simpli
f
y
t
3
404
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sc
h
indelin
rebase
-
i
-
p
:
use the
'topi
c
'
c
ommand in
the generated
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
rebase
-
i -p: add the 'topic' co
m
mand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes S
c
hindelin
rebase -i -p: add
a
u
tomatic book
m
ark
'onto' for all
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
re
b
ase -
i
-p: use
better
b
o
ok
m
ark names fo
r
merg
e
par
e
nts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
c
hindelin
rebase -i
-
p: use book
m
ar
k
s
i
nstead of <short-sha1>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Sch
i
ndelin
reba
s
e -i
-
p
: complain when rewritten commits are
unrea
c
habl
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
reba
s
e -i -p
:
add a 'bookmark' command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
annes Schindelin
Add a
test for
rebase
'
s new '
g
oto
'
and 'merge'
comma
n
ds
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es S
c
hindelin
rebase -
i
:
if
t
he user issues "goto" or "merge
"
c
o
mmands
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schin
d
elin
rebase
-i -p: relax t
h
e
sy
n
tax
of
t
he "merge"
c
ommand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
c
hindelin
WIP
fake-e
d
itor: split into out
p
u
t
improvements; merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
r
ebase -i -p
:
all
o
w making
a
n
e
w merge
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
nnes Sch
i
ndelin
re
b
ase -i -p:
generate a scr
i
pt using "goto" and "merge"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
a
nnes Sch
i
n
d
elin
WIP make obsolete!
rebase
'
s
f
a
ke-edito
r
: prepa
r
e
f
o
r
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
lin
WI
P
: sp
l
it D
R
OPPED part to its own commit! rebase
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -i -p: refactor the prep
a
r
a
tion f
o
r -p into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
r
e
base
-i:
l
et generate_
s
cript output
t
o stdout
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
n
d
elin
rebase -i: move
t
h
e
co
d
e to wri
t
e
t
he re
b
ase
s
cript
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
r
e
base -i: make
s
ur
e
that the commands record the rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
r
e
base -i -p:
A
dd
the "merg
e
"
command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindeli
n
rebase -
i
-p
:
a
d
d a helpe
r
to
add mappings for rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Sc
h
indelin
re
b
ase -i: add th
e
"go
t
o
"
comma
n
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
rebase -i -p: add helper
p
arse_commit() to fi
n
d rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Make s
o
me
tests in t3412
a
little bit stricter
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
rebase -i --root:
s
i
mplify code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
rebase -i
:
simplify saving the -
-
root option
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indelin
Merge merge-r
e
cu
r
sive
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
Mer
g
e utf8
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Sc
h
indelin
merge-recursive: fail
gracefully with directory/subm
o
dule
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add tests fo
r
directory/submodule and file/
s
ubmodule
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
S
c
hi
n
delin
Add
g
i
t
-fmt, a te
x
t wrapper
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
n
es Sc
h
i
n
del
i
n
M
e
r
g
e
levens
h
tein
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Add test-levenshtein
,
a tool to calculate distan
c
e
s
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
e
s S
c
hind
e
l
i
n
Merg
e
branch 's
t
r
b
uf'
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
diffcore-ren
a
me:
r
epl
a
ce b
a
sename_same
(
) heuristics
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
Add strbuf_vaddf(), use it i
n
strbuf_a
d
df()
,
and add
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schin
d
elin
Merge daemon
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
Merge
stash
-
i
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schi
n
d
elin
Add a
test f
o
r git-daemon and clone via g
i
t:// pro
t
oc
o
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes
Schind
e
l
i
n
Merge misc
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
S
chindelin
M
o
ve "require_clean
_
work
_
t
r
ee
"
into
git-sh-se
t
u
p
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Some additional tests
f
o
r t
6
101-rev-parse-parents
.
sh
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add remove_lea
d
ing_dire
c
tor
i
es()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
nes Sch
i
nde
l
in
Merg
e
colonslash
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
Sc
h
inde
l
in
Merge mv
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
I
n
t
e
r
pre
t
:
/
<
pattern> as a regu
l
ar expression
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
git mv:
t
ry harder to keep index entries intact
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
ne
s
Schindelin
Merge crlf
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindel
i
n
Res
p
e
ct crl
f
attribute in "git
a
dd"
e
ven if core
.
autoc
r
lf
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schindelin
M
erge fsck
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chi
n
del
i
n
Me
r
ge new-workd
i
r
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
nes Schinde
l
i
n
Teach "gi
t
branch" about
--new-workdir
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Merge arg
v
0_path
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
Mer
g
e
a
dd-e
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schin
d
elin
Set up argv0_pat
h
corr
e
ctly,
e
v
en whe
n
argv[0] is just
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schinde
l
in
M
er
g
e m
a
ke_install
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Con
t
ribute gitd
i
ff
.
vim f
o
r use with "git add
-e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindeli
n
M
e
r
ge comple
t
i
o
ns
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schinde
l
in
make install: warn about a "git" in
GI
T
_EXEC_
P
A
T
H
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oh
a
n
nes S
c
hindelin
completion: nicer
PS1
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindel
i
n
git-comple
t
i
on
:
aut
o
matically change prompt
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
n
e
s
Schindelin
M
a
ke git-
c
omplet
i
on
.
bash a first-c
l
ass citizen
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Sc
h
indel
i
n
TODOs
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
bash co
m
ple
t
ions: Add
--no
-
index to t
h
e
d
iff
options
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
a
n
ne
s
Schindelin
g
rep -P
:
a
l
low op
t
i
onal arg
u
ment
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
h
i
nde
l
in
grep: Add th
e
o
pt
i
on '--open-files-in-pager'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes S
c
hind
e
lin
Unify
c
ode
paths of
t
hreade
d
greps
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
split-topic-b
r
a
nches: add an
op
t
ion
to avoid Octopus
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes
S
chindeli
n
Con
t
r
i
bute
a
script to
split a given
c
ommit ran
g
e into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
n
es Schindelin
A
d
d d
i
ff option '--
c
ollapse-non-alnums'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nn
e
s Schin
d
elin
Intr
o
duce core
.
ke
e
p
H
a
r
dLinks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
n
n
e
s
S
chinde
l
in
name-rev
-
-stdin: handle t
a
g
s
,
too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next