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
Merge commit '84b65f54ea5ed2d044bc85880b452e5a5d2d8096' into HEAD
2010-02-07
J
ohannes Schindelin
Merge commit
'84b65f54e
a
5ed2
d
044
b
c85880
b
45
2
e5a5d2d8096
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
Sc
h
i
n
delin
Allow setting default di
f
f
options
via diff
.
defaultOptio
n
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
elin
WI
P
: grep --s
u
b
stitute
<substitution> <patt
e
rn>
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
Introduce strbuf_re
g
sub()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
n
e
s Schin
d
elin
Merg
e
cl
o
ne
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
clone: ignore --depth when cloning
local
l
y (implicitly
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Teac
h
the '-
-
exc
l
ude'
op
t
io
n
t
o
'diff --n
o
-index'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
nn
e
s
Schindelin
Merge g
r
amm
a
r
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
Min
o
r gr
a
mmar fix in
the '
N
ot
a
git reposit
o
r
y' message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nne
s
S
c
hinde
l
in
Merge commit 'push-into-head'
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Ad
d
a few mor
e
value
s
f
or recei
v
e
.
de
n
yCurrent
B
ranch
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
el
i
n
W
I
P: Enforce cor
e
.
autocrlf=false for cvsimport
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
d
e
lin
Merge rebase-i
-
p
commit
|
commitdiff
|
tree
2010-02-07
J
oh
a
n
nes Sch
i
ndelin
TODOs for rebase -i -
p
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes
S
chindelin
reb
a
s
e -i -p 'merge': if th
e
merge message
is o
m
itted
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
t3413: use
R
EBASE_S
C
RIPT for b
o
okmar
k
test
(
WIP: m
e
r
g
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
c
hindelin
t/li
b
-reb
a
se
.
sh
:
l
et f
a
ke
_
editor completel
y
rewrite
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
S
ch
i
ndelin
rebase-i: T
O
DO
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
WIP:
Simplif
y
t
3
404
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Sc
h
in
d
e
lin
reb
a
se -i -p: use
t
he 'topic' comm
a
nd
i
n the gen
e
rated
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
S
chindelin
rebas
e
-
i -p: add the '
t
opic'
c
ommand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
rebase
-
i
-p: add automatic bookmar
k
'onto'
f
or
a
ll
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes S
c
hindelin
reb
a
se -i
-
p: use be
t
ter
bookmark names for merge parents
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indeli
n
r
ebase -
i
-p:
u
se bo
o
kma
r
k
s
inste
a
d
of <short-s
h
a1>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
a
nnes Sc
h
i
ndelin
r
e
b
a
s
e -
i
-p:
c
om
p
la
i
n when
rewritten
c
o
mmits
a
re unreach
a
b
l
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Schindelin
rebase -i -p: add
a
'bookmark'
co
m
mand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hind
e
lin
Add a test f
o
r r
e
b
a
se's new 'goto'
a
nd 'merge' commands
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sc
h
indeli
n
rebase
-
i: if t
h
e user
iss
u
es "goto" or "merge" commands
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
n
e
s
S
chindel
i
n
rebase -i
-p: r
e
l
ax th
e
syntax of
t
h
e "me
r
ge" com
m
a
n
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
WI
P
fak
e
-
editor: split into output impro
v
emen
t
s;
m
erge
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindelin
rebase -i -p
:
a
l
low
making
a
new mer
g
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sch
i
n
de
l
i
n
r
ebase -i -p: generat
e
a
s
crip
t
u
sing
"
g
oto"
a
nd
"
merge"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schinde
l
in
WIP
m
a
ke ob
s
ol
e
te! rebase's fake-editor: prepare for
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es Schi
n
del
i
n
WIP
:
split DROPPED part to
its o
w
n
commit
!
rebase
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
rebase
-
i
-p:
r
efac
t
o
r
t
he preparatio
n
f
o
r -p into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
i
n
delin
rebase
-i: let generat
e
_s
c
ript output to stdout
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
rebase -i:
m
ove the code to
w
rite the rebase script
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase
-
i: make sure that th
e
comma
n
d
s
r
ecord the rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Sc
h
i
n
delin
rebase -i -p: Add the "merge" com
m
a
n
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
rebase
-i -p: ad
d
a h
e
lpe
r
to ad
d
mappings for rew
r
itten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -i: a
d
d
the "goto"
c
o
mm
a
nd
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -i -p: add helper parse
_
commit(
)
to find rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
nes Schin
d
elin
Make
s
ome tests in t3412 a little bit stricter
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s S
c
hindelin
r
eb
a
se -i -
-
root: sim
p
lify code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindel
i
n
r
eb
a
s
e
-i:
simplify saving the --root option
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sc
h
in
d
elin
Me
r
g
e
merg
e
-recursive
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Schindelin
Me
r
ge utf
8
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
S
c
hindelin
merge-recu
r
sive: fa
i
l gr
a
ceful
l
y
w
i
th d
i
rectory
/
su
b
module
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hann
e
s
Schin
d
elin
Add te
s
ts
for
dir
e
c
tory/submodule and file/submodule
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add git
-
fmt, a text wrapper
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes
S
chindelin
Merge le
v
enshtein
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
A
dd
test-l
e
ven
s
htein, a
tool to calculate distance
s
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
Merge br
a
nc
h
'str
b
uf'
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
S
chi
n
delin
diffcore-
r
e
name: re
p
lace basename
_
same() heuristics
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add
s
t
rbuf_vaddf(),
use it in
s
t
rbuf
_
addf(), and add
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindel
i
n
Mer
g
e daemon
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
an
n
es Schindel
i
n
Merge sta
s
h-i
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
annes Sc
h
indelin
Add a test for git-daemon
and cl
o
ne
v
i
a gi
t
:
// proto
c
ol
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hann
e
s
Schind
e
li
n
M
erge misc
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes S
c
hindelin
Move "requi
r
e_clean_work_tree" into git-sh-setup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes
Schi
n
d
e
lin
Some additional tests for t6101-
r
ev-parse-parents
.
sh
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schi
n
delin
Add remove_leadi
n
g_directories()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Merge colonslash
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schi
n
delin
Mer
g
e
m
v
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Interpret
:
/
<patt
e
rn> as a reg
u
lar e
x
pr
e
ssion
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Sch
i
ndel
i
n
git mv
:
tr
y
h
a
rder to keep index entrie
s
intact
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oha
n
nes
Schindelin
M
erge c
r
lf
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
Respec
t
crlf at
t
r
i
but
e
in "git
a
dd" even i
f
core
.
autocrlf
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indelin
M
erge
f
sck
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
Merge
new-workdir
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
Teach "git bra
n
ch" a
b
o
u
t --new-wo
r
kdir
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schind
e
lin
Merge argv0_path
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chinde
l
in
Mer
g
e
a
dd
-
e
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Sc
h
indel
i
n
Set up argv0_path c
o
rrectly, even when
a
rgv[0
]
i
s just
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
M
erge mak
e
_install
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindeli
n
Contribute gitdiff
.
vim for use wit
h
"git add -e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Mer
g
e completions
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindeli
n
make inst
a
ll: w
a
rn
a
bout a "git" in GIT_EXE
C
_PATH
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
n
e
s Schinde
l
in
com
p
le
t
ion:
n
ice
r
PS1
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
in
d
elin
git-complet
i
on:
a
u
t
o
m
at
i
call
y
c
h
ange prompt
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Ma
k
e git-com
p
l
etion
.
bash a fi
r
s
t
-
class citizen
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes
Schindelin
TODOs
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
b
ash co
m
pletions: Add --no-index to the diff
opti
o
ns
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
grep -P: allow op
t
ion
a
l
a
rgument
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
grep: Add
t
he o
p
tion '--open-
f
i
les-in-pa
g
er'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohan
n
es Sch
i
ndelin
Unify co
d
e pa
t
h
s
o
f threaded
greps
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
spli
t
-topic-branches:
add
a
n option to avoid
O
ctopus
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Sc
h
indelin
C
o
ntr
i
b
u
te a
sc
r
ip
t
t
o
split
a
given com
m
it range into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes S
c
h
i
ndelin
Add diff option '--collap
s
e-n
o
n-a
l
num
s
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
e
l
i
n
Introduce core
.
keepHardLinks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
name-rev --stdi
n
: ha
n
d
le tags,
t
oo
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
Miklos' testcase
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Sch
i
n
d
elin
git sh
o
w
<tr
e
e
>
: s
h
o
w mode and ha
s
h,
and
h
andl
e
-r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
el
i
n
W
IP
:
hg fast
-
export
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Ad
d
a
lis
t
of
things that are still shell scripts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Sc
h
indelin
Gi
t
web: use Henr
i
k Nyh'
s
beautiful icons
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
annes Schindelin
b
uiltin-remote: ma
k
e reuse
of
c
ode
e
asier
by
not die
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
l
in
Add a s
i
mple script to mir
r
o
r
svn refs into refs/heads
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add a
l
ink fo
r
konq
u
er
o
r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add the
p
lan for che
e
t
ah
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next