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
RPM spec: include git-p4 in the list of all packages.
2007-03-31
Theodore Ts'o
Renam
e
war
n
() to
warning() to fix symbol
c
onfli
c
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
h
eodore Ts'o
merg
e
t
o
ol: Clean up descriptio
n
of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
merg
e
t
ool: Make git-r
m
quiet
w
hen
r
esolving
a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergeto
o
l: A
d
d support for Ap
p
le M
a
c OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
mergetool: Fix abor
t
command when
r
esolvi
n
g
s
y
mlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
mergeto
o
l: R
e
mov
e
spurious error message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'
o
mergetool
:
factor out common co
d
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: portabi
l
ity fix:
d
on't use rese
r
ved wor
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
d
ore
T
s
'o
mergetool: port
a
bility fix: don't assume
t
rue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
Ts'o
mergetool: Don't error
out in the me
r
g
e case whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts
'
o
me
r
getool: Replace 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
eodore Ts'o
Fix
m
in
o
r
form
a
tting issue in m
a
n page
f
or git-merg
e
too
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetool: print
a
n
appropria
t
e warning
i
f
m
e
rge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore
T
s'
o
A
d
d git-mergetool to run an appropriate mer
g
e
conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
he
o
dore
Ts'o
Add defi
n
i
t
i
on
of <commit-ish> t
o
t
h
e main
g
i
t man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
A
l
low gi
t
-remote to u
p
d
ate nam
e
d group
s
of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
e
odore Ts'o
Add
c
onf
i
g_boolean()
m
e
t
ho
d
to the Gi
t
perl m
o
d
u
le
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theod
o
re Ts'
o
T
e
a
ch
git-
r
e
m
ot
e
to update existing remotes by
fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodor
e
T
s
'o
Allow al
i
ases to
e
xpa
n
d
to shell commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
P
r
int a sane err
o
r message if
a
n
alias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Th
e
odore Ts'o
Fix formatting for urls section
of fetch, pu
l
l, an
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree