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 clone
2010-02-07
Joh
a
n
n
es Schinde
l
in
Merge clo
n
e
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nne
s
Schinde
l
in
clon
e
:
ign
o
re --dep
t
h whe
n
cloning locall
y
(implicitly
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schi
n
delin
T
each the
'--exclu
d
e' option to
'diff --n
o
-index'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Sch
i
ndeli
n
Me
r
ge
g
ram
m
ar
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes
Schin
d
elin
Minor
g
rammar fix in the
'Not
a
git repository
'
messag
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
ann
e
s
Schindelin
M
e
r
g
e commit 'push-i
n
t
o
-head'
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes
Sch
i
ndelin
Add a
f
e
w
m
ore values fo
r
r
e
ceiv
e
.
denyCurrentBranch
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes
Schindelin
WIP: E
n
force core
.
autoc
r
lf=false
f
or cvsimpor
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
Merge rebase-i-p
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindelin
TODOs for
rebase -i -p
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase
-
i
-p 'm
e
rge': if the merge m
e
ssage is omitted
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
t34
1
3: use REB
A
SE
_
SCRIPT for bookmark test (WIP: m
e
rge
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
t/lib-reb
a
se
.
sh
:
let
f
a
k
e_
e
dito
r
c
ompletel
y
rewrite
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Sch
i
ndelin
rebase-i:
T
ODO
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
WIP: Simplif
y
t3404
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
d
elin
r
ebase -i -p
:
use the 'topic' co
m
mand in the
generated
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oh
a
nnes Schin
d
elin
reb
a
s
e
-i -p: add the 'topic' co
m
mand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schi
n
delin
rebase -i -p: add a
u
tomatic bookmark
'
o
nto
'
for all
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
S
chindelin
r
e
base -i -p: use b
e
tte
r
bookmark names for me
r
ge paren
t
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
n
n
e
s
Schindelin
rebase
-i -p: use b
o
okm
a
rk
s
in
s
te
a
d of <short-sha1>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
n
d
e
lin
r
e
base -i -p: comp
l
ai
n
when
rewritten c
o
m
mits are unr
e
a
c
h
ab
l
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -
i
-p: add
a 'bookmark' command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes S
c
hi
n
d
elin
Add a test
f
o
r rebase's n
e
w
'goto' a
n
d
'
m
erge' c
o
mmands
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schindelin
reba
s
e -
i
: if the user
i
ssue
s
"got
o
" or "merge" c
o
mmands
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es
S
chindeli
n
reb
a
se -i -p: relax the
syntax of
the "merge" command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nne
s
Schindelin
W
IP fake-editor: split into out
p
ut improvements;
m
erge
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
r
e
base -i
-p: allow making a new me
r
ge
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
n
n
es Schindelin
r
e
base -i -p: generate a scri
p
t
u
sing "go
t
o" and "
m
er
g
e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Sch
i
ndeli
n
WIP make ob
s
olete! rebase's fake-editor: p
r
epare fo
r
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindel
i
n
WIP
:
split D
R
OP
P
ED part to its own co
m
m
it!
r
eba
s
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es
Sch
i
nde
l
in
reb
a
s
e -i -p: refactor the preparation for
-
p into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
el
i
n
rebase -i: l
e
t
ge
n
e
r
ate_sc
r
ipt output
to stdout
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase
-i: move the code to write the rebase script
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Schindelin
r
e
b
a
s
e
-i:
m
ake sure that the com
m
a
n
ds reco
r
d the rewritt
e
n
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schinde
l
in
r
e
base -i -p:
A
d
d
the "merg
e
"
c
ommand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schindelin
r
e
ba
s
e
-
i -p: add a
h
elpe
r
to add mappin
g
s
for rewritt
e
n
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
rebase -i: add the "goto" comm
a
nd
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohanne
s
Schi
n
delin
rebase -i -p
:
add
helper parse_
c
ommit() t
o
f
ind
rewri
t
ten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
M
a
ke some te
s
ts
in t3412 a
l
itt
l
e bit s
t
r
ict
e
r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es
S
chindelin
reba
s
e -i
-
-ro
o
t:
sim
p
lify code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hanne
s
S
chindelin
rebase -i: si
m
plify saving the --root option
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindeli
n
Merge merge-re
c
ursiv
e
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schin
d
e
l
i
n
Merge utf8
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
merge-re
c
ursive: fail gracefully with directory/submodul
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Sch
i
nd
e
lin
Add tests for
directory
/
su
b
mo
d
ule and file/submodule
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
A
dd git-fmt, a text wrapper
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Mer
g
e
l
evensht
e
in
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es Schindeli
n
Ad
d
t
e
st-levenshte
i
n, a
tool to calculate distances
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Sc
h
in
d
elin
Merg
e
bran
c
h 'strbuf
'
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes
Sc
h
indelin
diffcore-rename
:
replac
e
basename_sam
e
()
heuristics
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
n
n
e
s
Sc
h
inde
l
in
Add strbuf_va
d
df(), use it in strbuf_addf
(
), and
add
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
ndelin
Merge
d
a
e
mon
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Me
r
ge stash-
i
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es S
c
hindel
i
n
Add a test for git-dae
m
on and clo
n
e via g
i
t:
/
/
p
rotoco
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oh
a
nne
s
Sch
i
ndelin
Merge mi
s
c
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
Move
"
r
equi
r
e_clean_wo
r
k_tree" into
g
it-sh-setup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
Some addit
i
ona
l
tests for t6101-rev-
p
ar
s
e-parents
.
sh
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
c
hindel
i
n
Add remove_l
e
adi
n
g_directories()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oha
n
nes
S
chin
d
elin
Merg
e
col
o
nslash
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindeli
n
Merge
m
v
commit
|
commitdiff
|
tree
2010-02-07
J
ohannes Schindelin
Interpret :/<pattern> as a regular expres
s
ion
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Sc
h
in
d
el
i
n
g
i
t
m
v: try harder to keep ind
e
x entr
i
es i
n
tact
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes S
c
hindelin
M
e
rge crlf
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
n
n
es Sc
h
i
ndelin
Respect
crlf attribute
i
n "git add"
eve
n
if cor
e
.
autocrlf
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es
S
ch
i
ndelin
Merge fsck
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
h
i
ndelin
M
e
rge new-workdir
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Schindelin
Teach "git bran
c
h" abo
u
t --n
e
w-workdir
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
nnes
S
chin
d
elin
Merge a
r
gv0
_
path
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
S
c
hindelin
Merge a
d
d-
e
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schin
d
e
l
in
Se
t
up ar
g
v0_path corr
e
ctly
,
e
v
e
n when argv[0
]
is
j
ust
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indelin
Merge make_install
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
Con
t
ribute g
i
tdiff
.
vim
f
or use
wi
t
h "git
a
dd -e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
lin
Merge completions
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schindelin
make install: warn about a "git" in GIT_E
X
EC_PATH
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schinde
l
in
completio
n
:
ni
c
er PS1
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
g
it-
c
ompletion:
auto
m
atically
chang
e
prompt
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
M
ake git-completion
.
bash a fir
s
t-class citize
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chi
n
delin
TODOs
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Sc
h
i
n
d
e
l
in
bas
h
c
o
mpletions: Add --no-index to the diff options
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schindelin
grep -P: allow
optional argument
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Sch
i
ndelin
gr
e
p: Add the o
p
tion '-
-
open-files-in-page
r
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes
S
chind
e
lin
Unif
y
code pat
h
s of threaded greps
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
lin
split-to
p
ic-b
r
anches: add
an option to
a
vo
i
d Octopus
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s S
c
h
indeli
n
Cont
r
i
b
u
t
e a script to spl
i
t a
g
i
ven c
o
mmit ran
g
e into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add di
f
f option '-
-
c
ollapse-non-alnums'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindeli
n
Introduc
e
core
.
keepHardLi
n
k
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s
Schindelin
n
a
me-rev --stdin: handle
t
a
g
s,
too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schindelin
Miklos' tes
t
ca
s
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes
Schindelin
g
it show <tree
>
: show mode and hash,
a
nd
h
andle
-r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
n
delin
WIP
:
hg fast-export
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nn
e
s S
c
hindelin
A
d
d
a list
o
f
t
h
ings that are
still she
l
l scripts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
an
n
es Schind
e
lin
Gitweb: use
H
en
r
ik N
y
h
'
s
beautiful icons
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes
Schind
e
lin
builtin-remote: make reuse of code easi
e
r
by n
o
t die
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add a simple script to mirror
svn refs into refs/
h
eads
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schi
n
delin
A
d
d
a
link
fo
r
konqueror
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
lin
Ad
d
the
p
l
an
for che
e
tah
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
M
a
k
e CFLAG
S
more strict
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schin
d
el
i
n
Some of Dscho's tools
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
debug settings in Ma
k
efi
l
e
commit
|
commitdiff
|
tree
2010-01-12
J
o
hannes
S
chindel
i
n
In
t
rodu
c
e
<branch>@{upstream} not
a
t
i
o
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next