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
(encode_85, decode_85): Mark source buffer pointer as "const".
2007-03-31
Theodore Ts'o
Rename warn() to warning() to fix sy
m
bo
l
con
f
licts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
me
r
getool: C
l
ean up description of fi
l
es and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erge
t
ool: Make gi
t
-rm
quiet when
r
esolving a delete
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool: A
d
d su
p
p
ort fo
r
Appl
e
Mac OS
X
's o
p
endiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
merg
e
tool: Fix ab
o
rt
c
omman
d
whe
n
re
s
olving sy
m
links
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
r
getoo
l
:
R
emove spur
i
o
u
s error mes
s
age if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool:
fact
o
r o
u
t common c
o
de
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: porta
b
ility fix: don
'
t
u
se
re
s
erved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
me
r
ge
t
ool: portability f
i
x: don't assume true
is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
D
o
n't error
o
ut in t
h
e merge case whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
he
o
d
o
r
e
Ts'o
m
er
g
e
t
ool:
Repl
a
c
e
us
e
of "echo -n" with
p
r
intf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
r
e
Ts'o
Fix minor f
o
rmatting is
s
ue in man page for git-mer
g
e
tool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theo
d
ore
T
s'
o
m
e
rgetool: print an appropriate warning if merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
A
dd git-me
r
g
e
t
ool t
o
run an appropriate mer
g
e conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Th
e
o
d
ore Ts'o
Add
defin
i
tio
n
o
f <c
o
mmit-ish> t
o
the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'o
Allow git-remote to
u
p
date named groups of re
m
otes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
do
r
e Ts'o
Add c
o
n
fig_boolean() me
t
ho
d
to the G
i
t perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theod
o
r
e
Ts'o
Teach git-remote to u
p
d
a
te existing remot
e
s by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
Allow aliase
s
to expand to s
h
ell commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
T
s'o
Prin
t
a sane
e
rror m
e
s
sage if
an ali
a
s expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix f
o
rmatting
for urls section of fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree