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
Documentation/diff-options: reword description of --submodule option
2009-10-20
Johannes
S
chi
n
delin
Add the --submodule option
t
o
th
e
diff option
family
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-18
Johannes Schindelin
filter-branc
h
: a
d
d an example how to add ACKs to a
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-10
Johan
n
e
s
Schind
e
lin
Correctly mark cover
l
etters' enc
o
dings if they
a
re
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-08-10
Johann
e
s
Schindeli
n
Expose the
has_non_asci
i
(
) fu
n
ction
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-31
Jo
h
ann
e
s Schind
e
lin
pars
e
-opt: optionally show "--no-
"
op
t
i
o
n string
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-31
J
ohannes S
c
hindelin
Ma
k
e 'gi
t
sta
s
h
-k' a s
h
ort
f
orm for
'
git
stash save
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-07-24
Jo
h
annes Schindelin
git
r
epack: keep commits hidden by a gra
f
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-18
Johannes
Schindelin
import-tars: support
s
ymlinks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-08
Jo
h
annes Sch
i
n
d
elin
Fix warning
s
i
n nedma
l
loc
w
hen compil
i
ng wit
h
G
C
C 4
.
4
.
0
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Johan
n
es Schindelin
M
inGW:
fix warning about
i
mp
l
icit
d
e
c
lara
t
ion of _getch()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Joh
a
nnes Schindel
i
n
t
est-chmtime: work a
r
o
und Windows
limitation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Johann
e
s S
c
hindeli
n
W
o
r
k around a
r
egr
e
s
s
ion in
Windows 7, causing er
a
se
_
in
_
l
i
ne
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Joha
n
n
es Schind
e
lin
Q
uiet ma
k
e: d
o
not leave Windows behind
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-06-01
Jo
h
annes Schindelin
M
i
n
G
W: GC
C
>=
4 does n
o
t
n
ee
d
S
NPRINTF_SIZE_CORR an
y
more
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Johannes S
c
hinde
l
in
MinGW
:
Fix co
m
piler warni
n
g in merg
e
-recursi
v
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schindelin
Mi
n
GW: Add a simple g
e
tpas
s
(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Johann
e
s
Schinde
l
in
MinGW: u
s
e POSI
X
signa
t
ure
o
f
w
aitpid()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-23
Joha
n
nes Sch
i
ndelin
MinGW: the path separa
t
or to split GITPERLLIB is
'
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-21
Johannes Schin
d
elin
Cop
e
better w
i
th a _lot_
of pack
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-05-14
Johannes Sch
i
ndelin
Add NO_CROSS_
D
I
R
ECT
O
RY_
H
ARDLINKS sup
p
or
t
t
o
th
e
Makef
i
l
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-29
Johannes Schi
n
delin
Rename core
.
unre
l
i
ableHardlinks to core
.
create
O
bject
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-28
Johannes Schin
d
elin
t
3
702: fix reliance on
S
HELL_PATH being
'
/bin
/
sh'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-27
Johannes Schindelin
t5701: do not get stuck in empty-push/
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-25
Johann
e
s Schindelin
Add an option not to use l
i
nk(
s
rc
,
d
e
s
t
) && u
n
link
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-20
J
ohannes
S
chindel
i
n
Fix off-by-one in
read_tree
_
recur
s
ive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-12
J
o
hannes Schi
n
delin
git-add: introd
u
ce --e
d
i
t
(t
o
edit the dif
f
vs
.
t
he
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-12
Joha
n
nes Schindelin
git-svn: always
i
n
i
tialize with core
.
autocrlf=false
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-02
Johanne
s
Schin
d
el
i
n
F
ix
'
git checkout <submodule>' to
u
pda
t
e
t
he inde
x
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-04-01
Joh
a
nn
e
s Schin
d
elin
mailmap: resurrec
t
lowe
r
-
c
asi
n
g
of email addr
e
ss
e
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-30
J
ohannes Schindelin
import-zips: fi
x
thinko
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-25
J
o
hann
e
s Schindelin
Guard a few
Mak
e
file variabl
e
s
against
u
ser enviro
n
ments
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-22
Joha
n
nes
S
chindeli
n
Smudge
t
he files
fed to
e
xte
r
nal diff and textconv
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-19
J
oh
a
nn
e
s Schindeli
n
t7300: fix clean up on Windows
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-19
Johan
n
es Schindelin
g
c --agg
r
essi
v
e
: make it
really aggressive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-14
Johannes Schindel
i
n
test-l
i
b:
write test results to
t
est-results/<basename
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
Joha
n
nes
S
chindeli
n
t
e
s
t
: do not LoadModule log_con
f
ig_mo
d
ule unc
o
ndit
i
onally
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
J
o
h
a
nnes Schi
n
d
elin
winansi: su
p
p
o
rt ESC [
K
(erase
in line)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-11
Johannes Schi
n
delin
rsync trans
p
ort: allow local paths, a
n
d
fix tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-08
Johannes Schindelin
MinGW: fix diff --n
o
-index /dev/
n
ul
l
.
.
.
commit
|
commitdiff
|
tree
2009-03-08
J
ohan
n
es Sch
i
ndelin
Add an (optional, since expe
n
sive) test
f
or >2
g
b cl
o
nes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-07
Johannes Schindeli
n
Brown paper ba
g
fix
f
or MinGW 64-bit stat
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-05
Joh
a
n
n
es S
c
hindel
i
n
Mi
n
GW: 64-bit
f
ile offset
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-03-03
Johannes
S
chin
d
eli
n
rebase -i
:
avoid 'git re
s
et' when possible
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-22
Johann
e
s
Schindel
i
n
git conf
i
g
: trivi
a
l cleanup for editor a
c
t
i
on
commit
|
commitdiff
|
tree
2009-02-20
Johannes Schindel
i
n
system
_
path(
)
:
simplify using stri
p
_path
_
s
uffix(),
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-20
Johannes Schindel
i
n
Introduce the funct
i
on
strip_path_su
f
fix(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-18
J
o
ha
n
nes Schin
d
elin
T
u
rn
the
f
la
g
s
in str
u
ct di
r
_
s
t
ruct int
o
a
s
ingl
e
var
i
able
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-18
Johan
n
e
s
S
c
hind
e
lin
A
v
oid seg
f
ault with
'
git branch
'
when the HE
A
D
is
d
etached
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-15
Johannes Schindelin
gc:
make --prun
e
useful
a
ga
i
n by a
c
cepti
n
g an optio
n
al
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-09
Johannes Schindelin
Add two extra tests
fo
r
git rebase
commit
|
commitdiff
|
tree
2009-02-07
Johannes Sc
h
i
n
delin
sub
m
o
d
u
l
e:
warn abo
u
t non
-
s
ub
m
odules
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-07
Joha
n
nes Schin
d
elin
Let
ls-files strip trailin
g
slashes
i
n submodules'
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-06
Jo
h
a
nn
e
s
S
chindelin
valg
r
ind: do not require valgrind 3
.
4
.
0
or newer
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-06
Joh
a
nn
e
s
Schindel
i
n
filter-branc
h
: do not consider diverging su
b
modules
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johann
e
s Schindelin
apply: f
i
x
access to an unin
i
tialized mode v
a
riable
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johanne
s
Schindelin
te
s
t-lib: avoid assum
i
n
g that templates
/
are i
n
the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Sc
h
indelin
T
ests: let --valgrind imply --ve
r
bose and
-
-
t
e
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Jo
h
annes Schindel
i
n
Add
a
sc
r
i
pt t
o
coales
c
e the
valgri
n
d outputs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Jo
h
anne
s
Schi
n
delin
t
/Makefil
e
: pr
o
vide a '
v
algri
n
d'
t
arget
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johan
n
e
s
S
c
h
i
ndelin
t
es
t
-lib
.
sh:
o
ptiona
l
ly output to test-results/$T
E
ST
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
J
o
ha
n
nes Schindelin
Valgrind s
u
pport:
c
heck f
o
r m
o
re than just
pr
o
gr
a
mming
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-02-04
Johannes Schindelin
Add valgrind
s
u
pport in t
e
st scripts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-31
Johannes Schind
e
lin
Fix 'g
i
t
d
iff --n
o
-index' wi
t
h a n
o
n-exis
t
ing symlink
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schind
e
l
i
n
Si
m
plif
y
t3412
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Schindelin
Simpl
i
fy t3411
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Jo
h
a
nnes Schin
d
e
lin
S
i
mplify t3410
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johanne
s
S
chindelin
test-lib
.
s
h:
i
n
t
r
o
d
uce t
e
s
t
_commit() and test_mer
g
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johannes Sc
h
i
n
delin
lib-reba
s
e
.
sh: Doc
u
ment wh
a
t s
e
t_fake_
e
ditor() does
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-29
Johan
n
es Schindelin
t3404
&
t
3411: undo copy&paste
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-28
Johannes Schinde
l
in
F
i
x submodule squashing in
t
o
u
nrelated
c
ommit
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-27
J
o
h
annes Schindelin
test-pa
t
h-utils: Fix off by
o
ne,
f
ound by
valgrind
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-27
Joha
n
nes
Sch
i
ndelin
get_sha1_b
a
s
ic(): f
i
x inva
l
id memory
ac
c
ess, found
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-26
Johannes
S
chindelin
rebase
-
i --root: fix
check for
n
u
m
b
er of arguments
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-21
Joh
a
nnes Schind
e
lin
R
ename d
i
ff
.
s
u
ppress-
b
l
a
nk-empty to diff
.
suppressBlankEmp
t
y
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-20
J
ohannes Sc
h
indelin
Fix pars
i
ng of @{-1}@
{
1
}
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Joh
a
nnes Sc
h
i
n
del
i
n
rev
i
sion
w
a
l
ker: includ
e
a detach
e
d
HE
A
D in --all
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Joha
n
nes Schin
d
elin
t5540: clarify that htt
p
-push does not
h
a
ndle packed
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Johannes Schindeli
n
http-
p
ush: when makin
g
dire
c
tories, have
a t
r
ailing
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-18
Johannes
S
chindelin
http
-
push: fi
x
o
f
f
-by-path
_
len
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Joh
a
n
nes Sch
i
ndeli
n
colo
r
-w
o
rds: tak
e
a
n
o
p
tio
n
al regula
r
expression
describing
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
J
o
hanne
s
Schind
e
l
i
n
color
-
words: change alg
o
rithm to allow for 0-char
a
c
t
er
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Johannes Schind
e
lin
co
l
or-wor
d
s: refacto
r
word splitting a
n
d use ALLOC_GROW()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-17
Johannes Schindelin
Add color_fwri
t
e_l
i
n
es(), a functi
o
n
col
o
ring each
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-12
Jo
h
annes
S
chindelin
Add an expe
n
siv
e
test
fo
r
git-notes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-12
Joh
a
nnes Schindelin
S
pee
d
up g
i
t notes lookup
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
J
o
h
annes Schindelin
bash compl
e
tion
s
: Add th
e
--patience
o
ption
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
Joha
n
nes Schindeli
n
In
t
ro
d
uce the di
f
f
o
p
t
ion
'--pat
i
e
n
ce'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-07
Jo
h
anne
s
Schi
n
delin
Implement
the patience diff
algo
r
ithm
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
J
o
hannes Schindelin
show <tag>: reuse p
p
_use
r
_
i
n
fo() in
s
t
e
ad of dup
l
icatin
g
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
Johannes S
c
hindelin
git add: do not add files
f
rom a sub
m
odule
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-05
Johanne
s
Schind
e
l
in
bundl
e
: allow rev
-
list o
p
tio
n
s to exclud
e
annota
t
ed
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-03
Johannes S
c
h
i
n
delin
bisect
v
i
ew:
call git
k
if
C
ygwi
n
's SESSIONNAME variable
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2009-01-02
Jo
h
annes Sch
i
ndelin
git wrapper: Make while loop
m
ore read
e
r-fri
e
ndly
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-25
Johannes S
c
hindelin
merge
-
r
e
curs
i
ve: m
a
rk r
e
nam
e
/delet
e
conflict as
u
nmerged
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-24
Johannes S
c
h
inde
l
in
rebase -i -p: leave a --cc patch when a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-21
Joha
n
nes
S
ch
i
ndelin
A
dd
a
s
cr
i
pt to e
d
it/
i
nspect notes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Schindelin
Introduc
e
com
m
it
n
otes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-20
J
o
h
annes Sc
h
indelin
fast-export: deal with t
a
g
o
bje
c
ts that do
n
o
t
have
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-17
Joha
n
nes
S
c
hindelin
g
i
t-
g
ui: Get rid of t
h
e last
r
emnants of G
I
T_C
O
NFIG_L
O
C
A
L
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2008-12-16
Johannes
S
chi
n
delin
fast-i
m
port: close pack b
e
fore unlink
i
ng i
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next