repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-mergetool: Make default selection of merge-tool more intelligent
2007-06-10
Th
e
od
o
re Ts'
o
g
it-m
e
rgetool: Mak
e
d
efault select
i
o
n
of
m
erge-
t
ool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-05-31
Theodore T
s
'o
F
ix minor grammatical
typos
i
n the git
-
gc man
page
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-05-10
Theodo
r
e Tso
Add --a
g
gressive
o
p
ti
o
n to 'git
g
c'
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-05-09
The
o
dore Ts'o
Increase pack
.
de
p
th default to 50
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts
'
o
Add pac
k
.
dep
t
h
o
pt
i
on to git-pack-o
b
jec
t
s
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rena
m
e warn() to war
n
i
ng()
t
o fix symbol
c
onfli
c
ts
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-30
T
heodore Ts'o
mer
g
eto
o
l: Cle
a
n
up description of files and prompts
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore
T
s'o
mergetool: Make git-rm q
u
iet when
resolving
a
del
e
ted
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Add s
u
p
p
o
rt
f
or Apple
M
ac OS X's o
p
e
ndiff
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Fix
abo
r
t command wh
e
n
r
esolving symlinks
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'
o
mergetool: Remove spu
r
ious error message if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'
o
mergetool:
f
actor out common code
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
r
e
Ts'o
mer
g
e
tool: portabi
l
it
y
fix: do
n
't use reserv
e
d
word
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore
Ts'o
me
r
getool
:
portability fix: do
n
't assume true is
i
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergeto
o
l: Do
n
't
e
rror o
u
t in the
m
er
g
e
ca
s
e where
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
od
o
r
e
Ts'o
mergetool: Re
p
lac
e
use
o
f
"
e
cho -
n
" with p
r
intf(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
Fix minor
f
o
r
matting issue in man
p
age for git-
m
er
g
etoo
l
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
Ts'o
mergeto
o
l:
p
rint an appropriate
warning
i
f merg
e
.
t
o
o
l
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodore
Ts'o
Add git-mergetool t
o
ru
n
an approp
r
iate merge conflict
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-06
Theodore
T
s'o
Add def
i
nition of <commit-ish> to th
e
ma
i
n git man
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-27
Th
e
o
d
ore Tso
Fix git-show man page fo
r
matting in the EXAMPLES sec
t
ion
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
Allow git-remote to
update
named
g
rou
p
s
o
f remotes
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add confi
g
_boolean() m
e
thod to
the G
i
t perl module
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-20
The
o
dore Ts'o
Teach g
i
t-remo
t
e to
u
pdat
e
existing r
e
motes by
fetching
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
All
o
w
alias
e
s to expa
n
d to shell
commands
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore
T
s'o
Prin
t
a sane er
r
or message
i
f
an alias
e
xpands t
o
a
n
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-01-01
T
h
eodore Ts
o
Fix formatting
for urls
section
o
f
f
e
tch,
p
ull,
and
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2006-12-31
Theo
d
ore Ts'o
Fix for
m
att
i
n
g
for url
s
section of fetc
h
, pull, and
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree