repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Handle http.* config variables pointing to files gracefully on Windows
2009-10-18
J
ohannes Schindel
i
n
Handle http
.
*
config var
i
ables pointing
t
o files grac
e
full
y
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
nes Sc
h
indel
i
n
f
ilter-
b
ran
c
h: add an example how to add ACKs
to
a
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-08-10
Johannes
S
c
h
indelin
Correctly mark co
v
er letters' encoding
s
if
the
y
are
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-08-10
Johannes Sc
h
ind
e
lin
Expose
the has_non_a
s
cii() function
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-07-31
J
o
han
n
es Schindelin
parse-opt: o
p
t
i
onally show "--n
o
-"
o
pti
o
n st
r
ing
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-07-31
Johannes Schindelin
Make 'git stash
-
k' a short
f
orm for 'git
s
ta
s
h save
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-07-24
J
o
hannes S
c
hindelin
git
r
e
p
ack: keep commits hid
d
en
b
y
a g
r
aft
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-18
Johannes Schindel
i
n
import-tars:
s
uppor
t
s
ymlin
k
s
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-08
Johannes Schind
e
lin
F
i
x warnin
g
s in nedmalloc when compi
l
ing with
G
CC 4
.
4
.
0
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-01
J
o
hannes S
c
h
i
ndelin
MinGW: fix warn
i
ng about impli
c
it decla
r
a
tion of _getc
h
()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-01
J
o
hannes Schindelin
t
e
st-chm
t
ime: work arou
n
d Windows lim
i
tation
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-01
Joh
a
n
nes Schind
e
lin
Work
a
round a regressio
n
in
Window
s
7, causing erase_i
n
_
l
i
n
e
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-01
Joh
a
n
n
e
s
S
c
hindelin
Quiet
make: do not leave
Windows be
h
ind
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-06-01
Joha
n
n
e
s Sc
h
i
n
delin
M
i
n
GW:
G
CC
>= 4 does not need SNPRINT
F
_
S
IZE_CORR anym
o
re
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-23
J
o
hannes Schindeli
n
MinGW: Fix compiler warning
in merge-rec
u
r
s
ive
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schindelin
MinGW: Add a simp
l
e getpass()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-23
Johannes
Sc
h
i
ndelin
M
inGW
:
use
POSIX signature of waitpid()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-23
J
o
h
annes
Schindelin
Mi
n
GW: the path separator to split GITPER
L
L
I
B is '
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-21
Jo
h
annes Schinde
l
in
C
o
pe
better with a _l
o
t_
of packs
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-05-14
Johannes Schindelin
Add NO
_
CROSS_DIR
E
CTORY_HARDL
I
NKS support to th
e
Makefile
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-29
Johannes
S
chi
n
delin
Re
n
ame core
.
unreliabl
e
H
a
r
dlinks t
o
c
ore
.
createOb
j
ect
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-28
Johannes Schindelin
t
3
702
:
f
ix reliance on SHEL
L
_PATH be
i
ng '/bin/sh'
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-27
Jo
h
ann
e
s Schindeli
n
t5701:
d
o not get st
u
ck in empty-push/
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-25
Johan
n
es S
c
hindelin
Add a
n
opt
i
on not to use
link(
s
rc, dest) && unlink
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-20
Jo
h
annes S
c
h
i
ndelin
Fix off-by-one in read
_
t
ree_recursive
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Schin
d
e
lin
git-add: introduce --ed
i
t (to edit th
e
diff
vs
.
th
e
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Schi
n
del
i
n
git-svn: always initialize with c
o
re
.
a
utocrlf
=
fa
l
se
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-02
J
o
ha
n
ne
s
Schi
n
de
l
i
n
Fix 'git checkout <s
u
bmodule>' t
o
u
p
d
a
t
e the
i
n
de
x
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes
S
chind
e
lin
m
a
i
l
map: re
s
urre
c
t lower-ca
s
ing of email
addr
e
s
s
es
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes
S
c
hindelin
im
p
ort-zips: f
i
x thinko
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-26
J
oh
a
nn
e
s Schindel
i
n
MinGW: the path separator to split
GITPERLLIB
i
s '
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-26
Johannes Sch
i
ndelin
gitk
:
remove
wo
r
karou
n
d
f
or mis
s
ing
m
sgfmt
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-26
Johannes
S
chindel
i
n
Revert bd2f73a6(Support the tools scripted
in per
l
.
)
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-25
J
o
h
annes Schindel
i
n
G
uard
a
f
ew Makefile variables ag
a
i
nst user envir
o
nments
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-22
J
o
hanne
s
S
chindeli
n
Smudge the files fe
d
to
exter
n
al diff and textco
n
v
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-19
Johannes S
c
h
i
nde
l
i
n
t7300: fix cle
a
n
u
p
o
n
Win
d
ows
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-19
Jo
h
ann
e
s Sc
h
indelin
gc --a
g
gressive: make it really
aggressi
v
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-18
Johanne
s
Schindelin
t
7
300
:
fi
x
clea
n
u
p
on Windows
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-14
J
o
hannes Schindel
i
n
test-li
b
: write test
results to te
s
t-re
s
ults/<basename
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-11
Johan
n
es
Schindelin
test
:
do
not LoadM
o
dule log_conf
i
g
_mo
d
ule unconditionally
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-11
J
ohannes
Sc
h
indeli
n
w
i
n
ans
i
: support ESC [ K
(
erase in line
)
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-11
J
o
hannes Sc
h
indelin
rsync transport:
allow l
o
cal paths, and fix tests
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-08
Johannes S
c
h
i
ndelin
Mi
n
GW: fix d
i
ff --n
o
-index /dev/null
.
.
.
commit
|
commitdiff
|
tree
2009-03-08
Joha
n
nes
Schi
n
d
e
lin
Add an (optional, sinc
e
expensive) test fo
r
>
2
gb clones
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-07
Johannes Sch
i
n
delin
B
r
o
wn paper bag
fix
f
or MinGW 64-b
i
t
s
ta
t
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-05
J
o
h
annes
Schind
e
lin
MinGW: 64-b
i
t f
i
le offs
e
ts
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-03-03
Jo
h
annes Sc
h
indelin
rebase
-
i
: avoid 'git
r
eset' when pos
s
ib
l
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-22
Johannes Sch
i
ndelin
git config:
trivial cleanup for edit
o
r act
i
on
commit
|
commitdiff
|
tree
2009-02-20
Johannes Schindelin
system_p
a
th(): s
i
mplify us
i
ng strip_path
_
suffix()
,
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-20
Johannes
S
chindeli
n
Intr
o
duce t
h
e functio
n
strip_path_suffix()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-18
Jo
h
an
n
es Schindel
i
n
T
u
rn the flags
in str
u
ct dir_struct into a single variable
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-18
J
oha
n
nes Schindelin
Avoid segfa
u
l
t with
'git
b
ranch'
w
hen the
HEAD is detached
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-15
Jo
h
a
n
nes Sch
i
nd
e
l
in
gc: make --prune useful again by
a
ccep
t
i
n
g
an op
t
ional
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-09
Johannes Schin
d
elin
Add two extra tests
for git rebase
commit
|
commitdiff
|
tree
2009-02-07
Johanne
s
Schin
d
elin
s
ubmo
d
ule: warn about no
n
-su
b
modules
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-07
Johannes Schind
e
lin
Let ls-files stri
p
trailing slashes i
n
submod
u
les'
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-06
Johannes Sc
h
indelin
valgri
n
d: do not require valgrind 3
.
4
.
0 or newer
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-06
Jo
h
annes Schind
e
lin
filter-
b
ranch: do not conside
r
d
i
v
erging
submod
u
l
e
s
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
J
ohan
n
e
s
Schi
n
delin
apply: fix ac
c
ess to an uninitialized
m
ode var
i
able
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
J
oha
n
nes Schindelin
test-lib: avoid assuming that
templates
/
are
in the
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Jo
h
annes Schind
e
lin
Tests: let --valgrind im
p
ly --verbose
and --tee
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Sch
i
nd
e
li
n
Add a script to
c
oalesce the valgri
n
d
o
u
tput
s
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Schi
n
delin
t/
M
akef
i
le:
provide
a
'
v
algrind' targe
t
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Johann
e
s Schindelin
test-lib
.
s
h: opti
o
n
ally output
t
o
test-re
s
ults/$TEST
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Schindelin
Valgrind support: check for more than just programm
i
ng
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-02-04
Joh
a
nnes Schindel
i
n
Add val
g
rind sup
p
o
r
t
in test scr
i
p
ts
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-31
Joha
n
n
e
s Sch
i
nde
l
in
F
ix 'g
i
t diff
-
-no-index'
w
ith a non
-
exist
i
ng symlink
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schindelin
Simplify
t3412
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
Jo
h
annes S
c
hindelin
Simplify t34
1
1
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Sc
h
i
n
delin
Sim
p
li
f
y t34
1
0
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
Johann
e
s
Schindelin
tes
t
-lib
.
sh: introduce test_commit() and
test_mer
g
e
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
J
o
h
anne
s
Schindelin
lib-rebase
.
s
h
:
Docume
n
t what set
_
fake_edi
t
or() does
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-29
Joh
a
nnes
Schind
e
lin
t3404 &
t3411: undo copy&pas
t
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-28
Johannes Schindelin
Fix su
b
mo
d
ule squ
a
shing into unrelated commit
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-27
Jo
h
anne
s
Schindelin
test-path-utils: Fi
x
off
b
y
one, fou
n
d b
y
va
l
gri
n
d
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-27
Johannes Schi
n
delin
get_sha1
_
basic()
:
fix
i
nvalid memo
r
y access,
found
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-26
Johannes Schindelin
rebase -i --r
o
ot: fi
x
chec
k
f
o
r
n
umber
o
f
arguments
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-21
J
ohannes Schin
d
elin
Rename diff
.
suppress-blank
-
empty to diff
.
suppressBlan
k
Empty
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-20
Johanne
s
Schi
n
delin
Fix p
a
rsing of @{-
1
}@{1}
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-18
Johannes Schind
e
li
n
revision walker
:
include a detac
h
ed H
E
AD
i
n --
a
ll
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-18
J
ohannes Schindelin
t554
0
:
clarif
y
that h
t
t
p
-push does not handle packed
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-18
Johanne
s
Schi
n
d
e
li
n
h
t
tp-push: when maki
n
g dire
c
tori
e
s, have a trailing
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-18
Johannes Schindelin
http-pu
s
h: fix o
f
f
-
by-p
a
t
h_len
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-17
Johannes Schindelin
color-word
s
: take an opti
o
nal regular ex
p
ression
de
s
cribin
g
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-17
J
o
hannes Schinde
l
in
color
-
words
:
cha
n
ge algorithm to allow for 0-ch
a
racter
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-17
Jo
h
annes Schind
e
li
n
color-words: r
e
factor word s
p
li
t
ting and use ALLOC_GROW()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-17
Johannes S
c
hi
n
d
eli
n
Ad
d
color_fwrite_lin
e
s
(), a
function c
o
lori
n
g
eac
h
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-12
Johan
n
es
Schindelin
A
d
d an expensi
v
e
test
for
git-n
o
tes
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-12
Joh
a
nnes Schindelin
Speed up git notes lookup
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-07
J
oha
n
n
e
s Schindelin
bas
h
comp
l
eti
o
ns: Add the --patience option
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-07
Joha
n
nes Schindelin
Introduce the diff op
t
i
o
n
'--patience'
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-07
J
o
hannes Schindelin
Impl
e
ment the pa
t
ience diff
algori
t
hm
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-05
J
ohannes
S
chindelin
s
how <tag>: reuse pp_us
e
r
_info() instead of duplicatin
g
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-05
Johannes Schindel
i
n
g
it add:
do
no
t
add files fr
o
m
a submodul
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-05
Johan
n
es S
c
hindeli
n
bundle: all
o
w
r
e
v-lis
t
options to exclude an
n
otated
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-03
Joha
n
nes Schin
d
elin
bi
s
e
c
t view: call gitk if Cyg
w
in
'
s SESS
I
ON
N
AME variable
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2009-01-02
Johann
e
s S
c
hind
e
lin
git
w
rapper: M
a
ke while loop
more reader-friendly
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2008-12-25
Johannes
Sc
h
indelin
m
erge-recursive:
mark
r
ename
/
delete con
f
lic
t
as unmerged
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2008-12-24
J
o
ha
n
nes Schindelin
rebase -i -p: leave
a
--cc patch
w
hen a
m
e
r
ge co
u
ld
.
.
.
commit
|
commitdiff
|
tree
2008-12-21
Johannes
Sc
h
indelin
A
d
d a
s
c
rip
t
to edit/insp
e
ct n
o
tes
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
next