repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/maint-hint-failed-merge' into maint
2009-10-30
Johan
n
e
s
Schindelin
d
i
ff --colo
r
-words
-
U0: fix the loc
a
tion of hunk head
e
r
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-28
J
o
h
annes
S
chindel
i
n
h
elp -a: do
not
u
nn
e
cess
a
rily look for a repository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-10-22
Joh
a
nn
e
s
S
chindeli
n
blame: make sure that the
las
t
line
ends in an LF
CC:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-18
Johannes Sch
i
ndelin
f
i
lter-bran
c
h: add an exampl
e
how to add ACKs to a
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-10
Johannes Schindelin
Correctly mark cover letters' enc
o
dings
i
f they are
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-10
Johannes Schind
e
l
i
n
Expos
e
the
h
as_non_ascii(
)
functio
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-31
Johannes Schindelin
parse-op
t
: optio
n
ally show "--no-" option s
t
ring
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-31
Johannes Schindelin
Make 'git stash -k
'
a
short form
for
'
gi
t
sta
s
h save
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-24
J
oh
a
nnes
S
chin
d
eli
n
g
it repack: keep
commits hid
d
en
b
y a graft
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-18
J
o
hannes Schindel
i
n
import-tars
:
support syml
i
nks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-08
Johannes Schindelin
F
ix warnings
i
n nedmalloc when compiling with GCC
4
.
4
.
0
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
J
ohanne
s
Schind
e
lin
M
inG
W
: fix warni
n
g a
b
out implicit declarati
o
n of _getch()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Johannes Schindelin
test-
c
hmtime
:
work
around Windows limitation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Johannes
Sch
i
n
d
elin
Work ar
o
u
n
d a regression in
W
i
n
dows 7,
cau
s
ing e
r
a
s
e_in_li
n
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Johannes
S
c
h
i
n
d
elin
Q
u
iet make:
do not
leave
W
indows
behind
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
J
ohannes Schindelin
MinG
W
: GC
C
>= 4 does not need
S
NPRINTF_SIZE_
C
O
RR
anymore
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schindelin
Mi
n
GW
:
Fix compiler wa
r
ning in merge-recursi
v
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Joh
a
n
n
e
s
Schindel
i
n
Min
G
W: Add a simple getpass()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schindelin
M
inGW:
u
se POSI
X
si
g
nature of
w
a
itpid()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
J
o
hann
e
s Schindelin
MinGW: the
path
s
e
p
a
rato
r
to split
GITPERL
L
IB
i
s
'
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-21
Johannes Schind
e
lin
Cope bet
t
er with a _lo
t
_ of
packs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-14
J
o
h
annes Schindelin
Add N
O
_CROSS_
D
IRECTORY_
H
A
R
DLINK
S
s
upport to the Makefi
l
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-29
Johanne
s
Schi
n
del
i
n
Rename c
o
r
e
.
unreliableHardlinks to core
.
creat
e
Obje
c
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-28
Joh
a
n
nes Schindel
i
n
t37
0
2
: fix relia
n
ce on
SHELL_PATH bei
n
g '/bin/sh'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-27
Jo
h
annes S
c
h
i
ndelin
t57
0
1: d
o
not g
e
t
s
tuck in empty-push/
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-25
Johanne
s
Schindel
i
n
A
dd
a
n
optio
n
no
t
to use
l
i
n
k(src, des
t
) && u
n
link
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-20
Johannes S
c
hindelin
F
ix
off-by-on
e
in
r
ead_tree
_
recursive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-12
Joha
n
nes Schindelin
git-add
:
i
n
troduce
-
-
edit (to edi
t
the di
f
f vs
.
the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-12
Johannes
Schi
n
d
el
i
n
git-
s
v
n
: always ini
t
i
alize with core
.
autocrlf=fa
l
se
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-02
Johannes Schinde
l
in
Fix 'git ch
e
cko
u
t <submodule>'
to upda
t
e the ind
e
x
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-01
Johannes S
c
hin
d
elin
m
a
ilmap: resurrect
lo
w
er-
c
a
sing of email
a
d
dresses
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-30
Johanne
s
Schindelin
import
-
zips: fix thinko
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-25
J
ohannes Schi
n
delin
Guard a
f
ew Ma
k
efile
v
ariables aga
i
nst us
e
r env
i
ronments
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Schin
d
elin
Smudge t
h
e
f
iles fed to extern
a
l diff and
t
extconv
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-19
Johan
n
es Schindelin
t73
0
0
: fix clean up on Win
d
ows
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-19
Johannes Sc
h
indeli
n
gc --aggressive
:
m
a
ke it really aggressive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-14
Joh
a
nnes Schindelin
test-lib: writ
e
test results to
t
est-r
e
sults/<ba
s
ename
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
J
ohannes S
c
hindel
i
n
tes
t
:
do not LoadModule lo
g
_config_module unconditionally
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
Johann
e
s
Schindelin
winansi: support ESC [
K
(erase in line
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
Johannes S
c
h
indelin
rsync trans
p
ort: allow
l
o
cal
p
aths, and fix tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-08
Johannes Schindelin
M
i
nGW: f
i
x
diff --
n
o-index
/
d
ev/null
.
.
.
commit
|
commitdiff
|
tree
2009-03-08
Jo
h
annes Sch
i
ndelin
Add
an (optional, since
e
x
pensive) test for >2gb cl
o
nes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-07
Johanne
s
Schindelin
Brown paper bag fix for
Mi
n
GW 64
-
bit stat
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-05
Joh
a
nnes S
c
hindelin
M
i
nGW: 64-bit file offsets
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-03
Joh
a
nnes S
c
h
indelin
rebase -i:
avo
i
d 'git re
s
et' when possible
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-22
Johannes Schi
n
delin
git
config: t
r
i
v
ial
c
lea
n
up for editor
action
commit
|
commitdiff
|
tree
2009-02-20
Joha
n
n
e
s Schinde
l
i
n
system_path(): simplify using
s
trip_
p
ath_
s
uffix(),
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-20
J
ohannes
S
chindelin
Introduce the function
s
t
rip_path_suff
i
x(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-18
J
oh
a
nnes S
c
hi
n
delin
Tur
n
t
h
e flags in
s
truct dir
_
struct into
a single variabl
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-18
Johannes S
c
hindeli
n
Avoid segfault with 'g
i
t
branch' when th
e
H
EAD is d
e
tached
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-15
Johannes Sch
i
ndelin
gc: ma
k
e --p
r
une useful again by acc
e
pting
an
o
ptio
n
al
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-09
Johannes
Schin
d
elin
Add
two extr
a
tes
t
s fo
r
gi
t
reb
a
se
commit
|
commitdiff
|
tree
2009-02-07
J
ohannes
Schindeli
n
submodule: wa
r
n ab
o
ut n
o
n-subm
o
d
u
les
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-07
Johannes Schi
n
delin
Let ls-files strip t
r
ailin
g
slashes
i
n submodules'
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-06
Johanne
s
Sc
h
indelin
valgrind: do not requi
r
e valgri
n
d 3
.
4
.
0 or ne
w
e
r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-06
Johannes Schindelin
filter-branch: do
n
ot consider diverging subm
o
dule
s
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes
Sc
h
indelin
a
pply: f
i
x access to
a
n u
n
in
i
t
ialized mod
e
variable
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Joh
a
nnes
Sc
h
indelin
test
-
lib: av
o
id assu
m
i
ng that template
s
/
a
re
i
n the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Sch
i
ndelin
Te
s
ts:
let --v
a
lgri
n
d imply --verbo
s
e and --tee
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Schindelin
Add a
script to coalesce t
h
e
v
algr
i
nd out
p
uts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Schindelin
t/Makefile: p
r
ov
i
de a 'valgrind' target
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Joh
a
nnes Schin
d
e
l
i
n
t
e
s
t-lib
.
sh: optionally output to test-results/$TEST
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
J
o
ha
n
n
e
s Schindelin
V
a
lgrind
suppor
t
:
check for more tha
n
just prog
r
a
mming
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johan
n
e
s Sch
i
n
d
elin
Ad
d
val
g
ri
n
d sup
p
or
t
in
t
est scr
i
pts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-31
J
o
h
an
n
es Sc
h
indelin
Fix 'git dif
f
--no-in
d
ex'
with a non-existi
n
g sy
m
l
i
n
k
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Joh
a
nnes Schinde
l
in
Simplify
t
3412
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schindelin
Simplify t3411
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schindel
i
n
S
i
mplify t3410
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schind
e
lin
tes
t
-lib
.
sh: introduce tes
t
_c
o
mmit(
)
and test_
m
erge
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schind
e
lin
lib
-
rebase
.
sh: Docume
n
t
what se
t
_fake_editor()
d
oes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johann
e
s
S
chindelin
t3404 & t3411: undo
copy&
p
aste
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-28
Johannes Sc
h
i
ndelin
Fix submodule sq
u
ashing into unrelated
c
ommit
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-27
J
o
hannes Schindeli
n
test-path-utils: Fix off by one, fo
u
nd by valgrind
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-27
J
ohannes Sc
h
i
n
delin
get_sha1_basic(): fix
i
nvali
d
memory access, f
o
u
n
d
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-26
J
o
ha
n
nes
S
chinde
l
in
rebase -i --r
o
ot:
f
i
x check for
number of arguments
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-21
J
oh
a
nnes Schindelin
Rename diff
.
suppre
s
s-blank-empty to d
i
ff
.
suppres
s
Blan
k
Empty
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-20
J
o
hannes Schindelin
Fix parsin
g
of @{-1}@{1}
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Joha
n
nes Schinde
l
in
revisi
o
n walker: include
a
d
e
t
a
ched HEAD in --all
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Johanne
s
Schindelin
t5540: clarif
y
that htt
p
-p
u
sh d
o
es not ha
n
dle pa
c
ked
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Johannes
S
ch
i
ndelin
http-push:
w
hen mak
i
n
g directories, have a t
r
a
ilin
g
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Joha
n
nes Sch
i
ndel
i
n
htt
p
-push: fix off-by-
p
ath_len
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Johannes Schind
e
lin
c
o
l
or-wor
d
s: take an optional regular expres
s
ion
describing
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Johannes Sc
h
in
d
eli
n
color-words: change algorithm
to allow
for 0-charact
e
r
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Johan
n
es Schind
e
lin
color-
w
or
d
s
:
refactor word splitting and use ALL
O
C_GROW()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
J
o
hannes Sch
i
ndelin
Add colo
r
_
f
w
r
i
te_l
i
nes(), a function colo
r
ing each
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-12
Johannes Schin
d
elin
Add an expensive test
for git
-
n
otes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-12
Jo
h
annes S
c
h
i
ndelin
S
p
e
e
d up
git notes lookup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
J
o
h
a
n
nes Schindelin
bash completions: Add t
h
e --
p
atience opti
o
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
J
oh
a
n
n
es Schindelin
Introd
u
ce the diff o
p
tion '--patienc
e
'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
J
o
hannes Schin
d
elin
Impleme
n
t the pa
t
ience dif
f
al
g
orithm
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
Johanne
s
Schindeli
n
show
<tag>: reuse pp_user_info() instead of d
u
p
l
i
c
a
t
ing
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
Johannes
S
c
h
in
d
elin
git
add: do not add fil
e
s from
a
su
b
module
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
Johannes Sch
i
ndeli
n
bundle: allow rev-l
i
st options t
o
exclude annotated
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-03
Johannes S
c
hindel
i
n
bisect
v
i
ew: c
a
ll git
k
if
C
ygwin'
s
SES
S
IONNAME variable
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-02
Joha
n
n
es Schi
n
delin
g
i
t
wrapper: Make while l
o
op more r
e
ader-friend
l
y
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-25
Joha
n
nes Schindel
i
n
merge-recurs
i
ve: ma
r
k
rename/delete conflict as unmerged
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-24
Johanne
s
Sch
i
ndelin
rebase
-
i -p: lea
v
e
a
--cc
patch when a mer
g
e could
.
.
.
commit
|
commitdiff
|
tree
2008-12-21
Johan
n
es Schi
n
delin
Add a sc
r
i
pt to edi
t
/inspect notes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Schindeli
n
I
ntroduce commit
notes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-20
Johanne
s
Sc
h
i
ndelin
fast-export: deal with tag
o
b
jec
t
s that do not have
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next