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 rebase-i-p
2010-02-07
Joh
a
nnes Schindelin
Merge rebase-i-
p
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indelin
TO
D
Os
f
o
r
rebase -i -p
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes
S
chindelin
reba
s
e -i -p '
m
er
g
e'
:
if the merge messa
g
e is omitted
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schindelin
t3413: use REBASE
_
SCRIPT for
b
ookmark te
s
t (
W
I
P
:
m
erge
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
t/lib-rebase
.
sh: let fak
e
_editor com
p
l
e
tely r
e
write
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schind
e
lin
r
e
bas
e
-i: TODO
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
WI
P
:
S
implify t3404
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
r
e
b
a
se -i -
p
: use t
h
e 'topi
c
'
comm
a
nd
in t
h
e
ge
n
e
rated
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schindel
i
n
rebase -i -p: add
the 'topic' command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
rebase -i -p:
add
automati
c
boo
k
mark 'onto' for all
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindeli
n
rebase -i -p
:
use b
e
tter bookmark names
f
or
m
erge parents
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es Sc
h
indelin
reb
a
se -i
-
p
: use bookmarks i
n
stead of <sh
o
r
t-sh
a
1>
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oh
a
nnes S
c
hin
d
elin
rebas
e
-i -p:
complai
n
w
h
e
n rewr
i
tten commits are unreachabl
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
n
es Schind
e
lin
rebase
-
i -p: add a 'book
m
ark' command
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
ch
i
nd
e
lin
Add a
test for rebase
'
s new '
g
oto' and '
m
erge' comman
d
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
r
ebase
-
i: if the user issues "goto"
o
r "merge" comman
d
s
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes
S
c
hindelin
re
b
ase -i -p: r
e
la
x
t
he synt
a
x
o
f the
"merge"
c
ommand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chi
n
delin
WI
P
fake-editor:
s
p
li
t
i
nto
o
utput improv
e
ments
;
merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
n
es Schi
n
d
e
lin
reba
s
e -i
-p
:
allow
m
a
king a new merge
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sch
i
nde
l
i
n
reb
a
se -i -
p
: generat
e
a
script using "g
o
to" and "merge
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
elin
WIP m
a
ke obsolete!
rebase's
f
ak
e
-editor: prepare for
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
han
n
es Schindelin
WIP: s
p
lit DRO
P
PED part to its own commit! rebase
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Sc
h
i
nde
l
in
rebase
-
i -p: refactor the
p
reparation for -p
i
n
t
o
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
re
b
ase -
i
: let g
e
ne
r
ate_sc
r
ipt out
p
ut to stdout
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
re
b
ase
-
i: m
o
ve the code to write the reba
s
e
s
cript
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
n
n
es Schindelin
rebase -i: make s
u
re that the comman
d
s r
e
cord the rewritt
e
n
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oha
n
nes Schindelin
reba
s
e -i -p: Add the "merg
e
" com
m
and
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -i -p:
add a
h
el
p
er
t
o add map
p
in
g
s fo
r
rewritten
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chin
d
elin
reba
s
e -i: add the "goto" co
m
man
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
rebase -i
-p:
a
dd helper parse_commit(
)
to find r
e
writte
n
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Make some tests in t3412 a litt
l
e b
i
t stricter
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
ha
n
nes Sc
h
indel
i
n
rebas
e
-i --root: sim
p
lify code
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
Schi
n
delin
rebase -i: s
i
m
p
lify sa
v
ing the --root opt
i
on
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
a
nnes Schindelin
Merge merge-r
e
cu
r
sive
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schi
n
delin
Merge utf8
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
merge-recursive: fail gracef
u
l
ly
w
i
th dir
e
ctor
y
/subm
o
dul
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hanne
s
Schindelin
Add tests fo
r
directory/submod
u
le and
file/submodule
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
Add g
i
t-
f
mt,
a text
w
r
a
ppe
r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
Merge levenshtein
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schin
d
elin
Add test-levenshtein, a tool t
o
cal
c
ulate dista
n
ces
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindel
i
n
Me
r
ge
b
ranch 's
t
rbuf
'
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
d
iffcor
e
-rename: replace
b
asename_sam
e
() heur
i
stics
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Sch
i
ndel
i
n
Add strb
u
f
_vaddf(
)
, use i
t
in strbuf_addf()
,
and
add
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s S
c
hindelin
Mer
g
e
d
aemo
n
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
anne
s
Schindelin
Merge stash-i
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
ann
e
s
S
chindelin
Add
a
test
f
or git-daemon and cl
o
ne via git:// p
r
otocol
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
Merge misc
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
indelin
Move "require_clean_wo
r
k_tree
"
i
n
to gi
t
-sh-setup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
annes
Schindelin
Some addition
a
l te
s
ts for t6101-r
e
v-parse-par
e
nts
.
sh
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Add remove_leading_director
i
es()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
M
e
rge colo
n
slash
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Merge mv
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Sch
i
ndelin
I
nterpret :/<patter
n
> as
a regular e
x
pre
s
sion
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
deli
n
g
i
t
m
v:
try harde
r
to keep index entries intact
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
M
e
rge crlf
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
inde
l
in
Respe
c
t
crl
f
attribu
t
e
i
n "git add" even if core
.
aut
o
crlf
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
Merge fsck
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindeli
n
Merge new-w
o
rk
d
ir
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
Teach
"git branch
"
about --new-workdir
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schind
e
lin
Merge argv0_
p
a
t
h
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Sch
i
ndelin
M
e
rge
a
dd-e
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schinde
l
in
Se
t
u
p
a
rgv0_path correctly, even
w
hen ar
g
v[0] is ju
s
t
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Mer
g
e mak
e
_install
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schi
n
delin
Co
n
tribute gitdiff
.
vim
f
or
u
se with "git add -e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes
Schindelin
Merge completions
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
make insta
l
l
: war
n
a
bout a "git
"
in GIT_
E
XEC_PATH
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
oha
n
nes
S
ch
i
ndelin
completion: nicer PS1
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Schindelin
git-c
o
mple
t
ion: automatically change
p
rompt
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
anne
s
Schinde
l
in
M
ake git-c
o
mp
l
etion
.
bash a firs
t
-cla
s
s citizen
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hindelin
T
ODOs
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
nnes Schinde
l
in
bas
h
c
o
m
ple
t
io
n
s:
Ad
d
--no-ind
e
x
t
o the diff
options
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
gr
e
p -P:
allow opt
i
onal argument
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
c
hindelin
grep:
A
dd the
option
'--open-f
i
l
e
s
-in-pager'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schi
n
delin
Unify code paths of threaded greps
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joha
n
nes Schindelin
split-
t
opic-branches: add an option to avo
i
d
O
ctopus
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
annes Schind
e
lin
Contribu
t
e a scrip
t
to split a g
i
v
e
n commit range into
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes
S
chindelin
Add diff option '--collap
s
e-non-
a
lnums'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Jo
h
a
nnes Sc
h
indelin
Introduce co
r
e
.
keepHar
d
L
inks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
e
s
Schindelin
name-rev -
-
s
tdin: handle tags, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schindelin
Mikl
o
s
' t
e
stc
a
se
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Sc
h
in
d
e
l
in
g
it show <tree>: show mode and hash, and
h
andle -r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes Schi
n
delin
WIP: hg fast-expor
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johannes S
c
hind
e
l
i
n
Add
a list of t
h
ings
t
ha
t
are still
s
hell scripts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Joh
a
n
nes
Schindelin
Gitweb: use H
e
nrik Nyh's beautiful icons
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
S
c
hindelin
builtin-re
m
ote: ma
k
e re
u
se
o
f code
easier
b
y n
o
t die
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
Add a simp
l
e script t
o
mirr
o
r svn refs into re
f
s/heads
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johann
e
s Schindelin
Add a link for konqueror
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johanne
s
Schin
d
elin
Add the pla
n
fo
r
cheetah
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
hannes Sch
i
n
delin
Make CFLAGS more strict
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
J
o
h
a
nnes Sch
i
ndelin
S
ome
o
f Ds
c
ho's tools
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2010-02-07
Johan
n
es Sch
i
ndeli
n
debug se
t
ti
n
g
s in Mak
e
file
commit
|
commitdiff
|
tree
2010-01-12
Johannes Schindelin
Introduc
e
<branch>@{upstream} n
o
tation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
ne
s
Schindelin
Allow spe
c
ifying the re
m
ote help
e
r in
the url
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-30
Joh
a
nnes Sch
i
nde
l
in
diff --color-words -
U
0: fix the l
o
cation of hunk
hea
d
ers
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-28
J
o
h
a
n
n
e
s
Schindelin
h
e
lp -a: do not unnecessaril
y
look for a repository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-22
J
ohannes S
c
hindelin
b
lame: make sure
tha
t
the last line ends in an
L
F
CC:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
nnes Schinde
l
i
n
Add the
--su
b
module opt
i
o
n to
t
he diff optio
n
fami
l
y
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
nnes Schindelin
Add '%
N
'-f
o
r
m
at for p
r
etty-printing co
m
mit n
o
tes
commit
|
commitdiff
|
tree
2009-10-20
Johannes S
c
hin
d
e
l
in
Add
an expen
s
ive test for g
i
t-n
o
tes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-20
Johannes Schindel
i
n
Sp
e
ed
u
p git
n
otes
lookup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next