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
Update git-applymbox documentation
2007-03-31
T
h
e
o
dore
T
s'o
Rename war
n
() to wa
r
nin
g
()
to fix symb
o
l conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'
o
merget
o
ol: Cl
e
an up description o
f
fil
e
s and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
m
ergetool: Make git-rm quiet when resolving a delete
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
mer
g
e
t
ool: A
d
d su
p
port for Apple Mac OS
X
's opendif
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
me
r
getoo
l
: Fix ab
o
rt command when resolving symli
n
ks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool: R
e
mo
v
e sp
u
rious error mess
a
ge
if merge
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erg
e
tool: fact
o
r out co
m
mon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
mergetoo
l
: p
o
rtabili
t
y fix:
don't u
s
e rese
r
ved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: p
o
rtabil
i
ty fi
x
: don't ass
u
me
true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts
'
o
me
r
g
e
t
ool: Do
n
't error
out i
n
the merge cas
e
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
me
r
getool: Rep
l
ace u
s
e
of "echo -n" with prin
t
f(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
Fix minor for
m
atting issue i
n
man pag
e
for
git-
m
erget
o
ol
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
The
o
dore
T
s'o
m
e
rgetool: prin
t
an appropr
i
ate w
a
rning if merg
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodor
e
T
s'o
Add git-merg
e
tool
t
o run an approp
r
iate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore
T
s'o
A
dd de
f
inition
o
f <commit-ish> to the main
git m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'o
Allow
g
it-remote to u
p
date named grou
p
s of rem
o
tes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
Ts'o
Add config_boolean
(
) method to t
h
e Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git-remote to
update existing remotes b
y
fetchi
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore
T
s
'
o
Allow a
l
iases to expand to shell comman
d
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
T
s'o
Print a san
e
error message if an ali
a
s expand
s
to
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix formatting for
u
r
ls section of fetch
,
pu
l
l,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree