repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: clarify track/no-track option.
2007-03-31
Theodore Ts'
o
Rena
m
e
w
arn() to warnin
g
() to fi
x
s
ymbol conf
l
icts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
mergetool: Clean up d
e
scri
p
tion of files
a
nd promp
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
he
o
dore
T
s'o
m
erg
e
too
l
: Make
g
it
-
rm quiet whe
n
r
es
o
lving
a de
l
eted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
r
e
Ts'o
mergetool
:
Add suppo
r
t for Apple Mac OS X's
o
pendif
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool
:
Fi
x
abort command
when re
s
olvin
g
symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heo
d
ore Ts'o
m
e
rget
o
o
l: Remove sp
u
rious erro
r
message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
ool: factor out co
m
mon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mer
g
etool: p
o
rt
a
bility fix: don
'
t
use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool: po
r
tabi
l
ity
fix
:
don't assu
m
e
true
is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
m
ergetool: Don't error
ou
t
in the merg
e
c
a
se whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
e
tool:
R
eplac
e
use
o
f
"echo -n" with printf(1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dore Ts'
o
F
i
x minor formatting i
s
sue in man page for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore
Ts'o
merge
t
o
o
l:
p
rint an appropriat
e
war
n
in
g
if merge
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
odore Ts'o
A
d
d git-me
r
getool to run
a
n appro
p
riate merge
con
f
lict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
The
o
dore Ts'o
A
d
d defini
t
i
o
n of <commit-ish> to the m
a
in git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
A
l
low git-remote to update named group
s
o
f remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Th
e
odore Ts'o
Add config_bool
e
an() m
e
thod to t
h
e Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Th
e
odore
T
s'o
Teach git-remote to update existing remot
e
s by f
e
tchin
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
e
o
d
ore Ts'
o
A
llow a
l
iase
s
to expand to
s
hell command
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Print a sane error
m
essage if an 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 url
s
section
o
f
fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree