repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
2007-03-31
Theodore
T
s'o
R
enam
e
warn() to warn
i
n
g(
)
to fix
s
ymb
o
l conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
h
eod
o
re
T
s'o
mergetool: Clean up descript
i
on o
f
files a
n
d promp
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool: Make git-rm quiet when res
o
lving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
m
e
rgetoo
l
: Add support for Apple
M
ac OS X's opend
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool
:
Fi
x
a
b
ort comm
a
nd when r
e
solving symlin
k
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
me
r
g
e
tool: Rem
o
ve
s
puriou
s
error messag
e
if merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool: factor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erget
o
ol: portability fix: don't use reserved wo
r
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eod
o
re Ts'
o
mergetool:
p
ortability fi
x
: don't ass
u
me tru
e
i
s
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'o
m
e
rgetool: Don't err
o
r out in the merge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
m
e
rgetool: Replace us
e
of
"
echo -
n
" with
printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore
Ts'o
Fix mi
n
or fo
r
mat
t
i
ng issue in man
page
f
or git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
m
erg
e
tool: print an
appropriate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-mergetool
t
o r
u
n an a
p
p
r
opriate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
heodore Ts'o
Add
defini
t
ion of <
c
ommit-ish> to the main g
i
t m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Allow
g
it-remote to upd
a
te named g
r
oups o
f
remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Add config_boolean(
)
meth
o
d to the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore
Ts'o
T
e
ach g
i
t
-
remote to up
d
a
t
e e
x
isting r
e
motes by fe
t
ching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
o
r
e Ts'
o
Allow a
l
iases to e
x
pand to sh
e
ll
comma
n
ds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Th
e
od
o
re Ts'o
Print a sane error
m
ess
a
ge 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 formatting for
u
rls section of
fetch, pul
l
, an
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree