repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix t4200-rerere for white-space from "wc -l"
2007-03-31
Theodore Ts'
o
Rename war
n
() to warning() to
f
i
x symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
h
eodore Ts'o
mergetool:
C
lean up desc
r
iption
o
f f
i
les and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
mergetool: Make git-rm quiet when reso
l
ving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
or
e
T
s
'o
me
r
getool: Add
support for App
l
e Mac OS
X's
o
pendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Fix abort command when resolving
s
y
m
links
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool
:
R
emove spur
i
ous error
m
essag
e
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
m
e
rgetool: factor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
mer
g
e
tool: portability fix:
d
on
'
t use rese
r
ved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergeto
o
l:
p
ortab
i
lit
y
f
ix: do
n
'
t
as
s
ume
true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Don'
t
error out in the
m
erge case
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts
'
o
m
ergetool: Replace use
o
f "
e
cho -
n
" with printf(1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix
m
i
no
r
formatti
n
g i
s
sue in man page fo
r
git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
The
o
dore
T
s
'
o
mergetool: print an
a
p
propriate warning if merge
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-mergetool to run an app
r
opriate merge con
f
lict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add defin
i
t
ion of <
c
o
m
mit-
i
sh>
to th
e
main git
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
e
o
dore
Ts'o
Allow g
i
t
-
remote t
o
update named g
r
o
u
p
s of remo
t
es
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add conf
i
g_boolean() method
to the Git perl mod
u
le
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git-re
m
ote to update exist
i
ng remotes b
y
fetch
i
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'
o
All
o
w
a
lias
e
s to expand
to sh
e
ll comma
n
ds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Pr
i
nt a sane er
r
or
m
e
s
s
age if an al
i
a
s
e
xpands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix formatting for urls s
e
ctio
n
of f
e
tch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree