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
Theodore Ts'o
Ren
a
me warn() to warnin
g
() to fix symbol co
n
f
l
ic
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Th
e
odore
T
s
'o
mer
g
etool: Clea
n
up de
s
cription of files and
p
r
o
mpts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
re Ts'o
mergetool: Make git-rm
q
uiet when resolving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
Ts'o
merge
t
oo
l
: Add support for A
p
ple Mac OS X's o
p
endi
f
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Fix abort command when resolving syml
i
nks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
od
o
r
e Ts'o
mergetool:
Remove spuri
o
us error message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rg
e
tool: factor out co
m
mon
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
merget
o
ol: portability fix:
d
o
n't us
e
r
eserved
w
or
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
Ts'o
merge
t
o
ol: portabilit
y
f
i
x: don't assume true i
s
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore
T
s'
o
m
e
r
getool: Don't er
r
or
out in the merge cas
e
w
here
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Re
p
lac
e
use
of "echo -n
"
with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor formatting
issue in m
a
n page fo
r
git-
m
ergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theo
d
ore Ts'o
mergetool: print an appropriate
warnin
g
i
f
m
e
rge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
odor
e
Ts'o
Add git-mergetool to ru
n
an ap
p
rop
r
i
a
t
e
m
erge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add definition o
f
<
c
ommit-
i
sh>
t
o
t
h
e main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'
o
Allow git
-
r
emote to upd
a
te named
groups of remot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add c
o
nfig_
b
o
olean() method to
t
he
Git perl
modu
l
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theo
d
ore T
s
'o
Te
a
ch gi
t
-remote to
up
d
ate existi
n
g re
m
otes by
f
e
tching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodor
e
Ts'o
Allow
a
liases to exp
a
nd to sh
e
ll commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eo
d
ore Ts
'
o
Pri
n
t a s
a
ne error messag
e
if
a
n alias expands
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore T
s
'o
Fix formatting for
u
r
l
s section of f
e
tch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree