repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
2007-03-31
Theodo
r
e T
s
'o
Ren
a
me warn() to warni
n
g() to fix symbol c
o
nfli
c
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theod
o
re Ts'o
mergeto
o
l
:
Clea
n
up description o
f
files and p
r
o
m
p
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'o
mer
g
eto
o
l
:
Make git-rm
quiet when resolving a
dele
t
ed
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool: A
d
d support
f
o
r Apple Mac OS X's op
e
nd
i
ff
.
.
.
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
mli
n
ks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore Ts
'
o
mergeto
o
l: Remove
s
pur
i
ous
e
rr
o
r m
e
ssage if merge
.
too
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odo
r
e Ts
'
o
mer
g
e
t
oo
l
:
fact
o
r
o
ut c
o
mmon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
Ts
'
o
merg
e
tool:
portability
f
i
x
: don't use reserv
e
d w
o
rd
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool:
portability fix:
d
on't ass
u
me tr
u
e is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore T
s
'o
m
ergetool: Don't error
o
ut in
t
he
m
erge ca
s
e
w
he
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'
o
merget
o
o
l
: Replace use o
f
"ech
o
-
n
" wit
h
p
r
intf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts
'
o
Fix minor formatting issue in man page
f
or git-mer
g
etool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
T
s'o
mergetool: print a
n
appropriate
w
a
r
ning if merg
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
h
eodore Ts'o
Add g
i
t
-
mergetool to run an appropriat
e
m
erge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodor
e
Ts
'
o
A
d
d definition of <commit-
i
sh> to the main git
m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
Ts'o
Al
l
o
w git
-
re
m
o
t
e to update na
m
ed
groups of
rem
o
t
es
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add
c
onf
i
g_boolean() method
t
o the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theod
o
re Ts
'
o
Teach git-remote to u
p
date existing remotes by f
e
tching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
Allow al
i
ases to exp
a
nd to s
h
ell commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re Ts'o
Print
a sane error m
e
ssage if an alias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix format
t
ing fo
r
u
rls section of fet
c
h, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree