repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cvsimport: Improve formating consistency
2007-03-31
Theodore Ts'o
Ren
a
me warn() to warning() to fix
symbo
l
confl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore
T
s'o
mergetool
:
Clean up
d
esc
r
i
p
tion
o
f files and pr
o
mpts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
merget
o
ol
:
M
a
ke git-
r
m
quiet whe
n
reso
l
v
ing a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
re Ts'o
m
ergetool: Add
s
uppo
r
t for Apple Mac OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Fix abo
r
t comma
n
d when
r
esolvin
g
symlink
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: Re
m
ove spurious
e
rror message if merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool: fac
t
o
r
ou
t
co
m
mon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool: portabili
t
y fix: don't us
e
reser
v
ed word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'
o
m
ergetool: portab
i
lity
f
ix: don't assume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
ore Ts
'
o
merge
t
ool: D
o
n't error out
i
n th
e
merge ca
s
e whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
m
e
rgetool: Replace u
s
e of "
e
cho
-n"
wit
h
pri
n
tf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
F
ix minor formatting issue in man pag
e
fo
r
git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodo
r
e Ts'o
m
ergetool: print
an a
p
propriate
warnin
g
if
merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodo
r
e Ts'o
Add
git-
m
e
rgetool t
o
run an a
p
pro
p
ria
t
e
m
e
r
ge c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add defi
n
i
t
ion
o
f <
c
ommit-ish> to
the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Allow git-remote t
o
update named groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add config_bo
o
lean
(
) method to the Git perl modul
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theo
d
ore T
s
'o
Tea
c
h git-remote to update existing remotes by fe
t
ching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
ore Ts'o
Al
l
ow alia
s
es to expand to shell com
m
ands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore Ts'
o
Print a
s
ane error
message i
f
an
alias expa
n
ds
t
o
an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
h
e
odore Ts'o
Fix forma
t
t
i
ng f
o
r url
s
section o
f
f
e
t
ch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree