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
git-submodule: remember to checkout after clone
2007-06-10
Theodore Ts'o
git-m
e
rgetool: M
a
ke
default sel
e
ctio
n
o
f merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodore Ts'o
Fix mino
r
gram
m
a
tical t
y
po
s
in
t
h
e
g
it
-
gc
m
an
p
age
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
Increas
e
pa
c
k
.
depth default t
o
50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
Add pack
.
d
epth option to gi
t
-pack-obje
c
ts
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theo
d
ore Ts'o
Rename
w
arn() to
w
arning() to fix symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts
'
o
mergetool: Clean up de
s
cr
i
ption of fi
l
es and pro
m
pts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s
'o
m
e
rgetool: Make
g
it-rm quiet
w
h
e
n
reso
l
v
i
n
g a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergeto
o
l: Add support
f
or Apple Mac OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
m
e
r
getool: Fix abort command when resolv
i
n
g symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
: Remove
spurious err
o
r message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
do
r
e
Ts'o
mergetoo
l
: factor
out comm
o
n code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
m
ergetoo
l
: portab
i
lity fix: don'
t
us
e
reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore T
s
'o
mer
g
etool: por
t
ab
i
lity fix:
do
n
'
t assume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore Ts'o
m
e
r
ge
t
ool: Don't
error
o
ut in the merge
c
ase where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetoo
l
:
R
eplace use of "echo -
n
" with pr
i
nt
f
(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
Fix minor
formatt
i
ng issue in
man page f
o
r git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
The
o
dore Ts'o
mergetool: print an
a
ppropri
a
te warning i
f
m
e
rg
e
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore
Ts'o
Add git
-
m
erg
e
t
ool to run an appr
o
priate merge confl
i
ct
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
h
eodore Ts'o
Add definit
i
on of <com
m
it-ish> to
the mai
n
git ma
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
heodore Ts'o
Allow git-remote to updat
e
na
m
ed groups of re
m
ot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theo
d
o
re Ts'o
Add conf
i
g_boolean()
m
e
thod to
the Git
p
erl
module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
The
o
dore Ts'o
T
e
ach git-remote to update existing remotes by fetc
h
ing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore T
s
'o
Allow al
i
ases
t
o exp
a
n
d
t
o
s
h
e
ll commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re T
s
'o
P
rint a sane er
r
or message if an alias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
he
o
dore Ts'o
Fix fo
r
matting for ur
l
s
sec
t
i
o
n of fetc
h
, pull,
a
nd
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree