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
Allow rebase to run if upstream is completely merged
2007-07-01
Theo
d
o
r
e
Ts'o
Don't fflush(stdout
)
when it's not helpfu
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore Ts'o
git-mergetool: Make default selection o
f
merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Th
e
odore Ts
'
o
Fix minor
g
rammatical t
y
pos in the
g
it
-
gc ma
n
page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
h
eodore Ts
'
o
Increase pack
.
dept
h
default to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Th
e
odore Ts'
o
Add pack
.
dept
h
opt
i
on to git-p
a
c
k-o
b
jects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rename wa
r
n() to w
a
rning(
)
to fix sym
b
ol
c
o
n
f
l
icts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
h
eodore Ts'o
merget
o
ol: Cl
e
an up description of
fil
e
s a
n
d prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s
'o
mergetoo
l
:
Make
git-rm q
u
iet wh
e
n resolving a d
e
l
eted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool: Add
s
u
p
port
for Apple Mac OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s'o
mergetool:
F
ix abort command when
r
esolving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
rgetool: R
e
move
s
purious
e
rror message if merge
.
too
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
me
r
getool: factor out comm
o
n co
d
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mer
g
et
o
ol: port
a
bility fix: do
n
't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merget
o
ol: p
o
rta
b
ility fix: don't
assume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts
'
o
merget
o
ol: Don't error ou
t
in the
merge cas
e
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
mergetool: Replace use of "ech
o
-n"
w
it
h
printf(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fi
x
m
i
nor fo
r
mattin
g
i
ssue in
ma
n
p
age for git
-
mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
T
s'
o
merget
o
ol: prin
t
a
n
appropriate war
n
ing if m
e
r
g
e
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
h
e
o
dore Ts'o
A
d
d
g
i
t
-
mergetool to
run an appropriate merge confli
c
t
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theod
o
re
T
s'o
Add definit
i
on of <
c
ommit-ish> to the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'
o
All
o
w git-remote to
u
pdate n
a
med group
s
of
r
emo
t
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
d
o
re Ts'o
Add config_
b
oole
a
n() meth
o
d
t
o the
Git perl
m
odule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git-
r
e
mote t
o
u
p
date exist
i
ng re
m
otes by
fet
c
h
i
ng
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
Allow
aliases
t
o
expand
to
shell
c
om
m
a
n
ds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
Ts'o
Print a
s
a
n
e error message if an
al
i
as expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore
Ts'
o
Fix
formatting for urls secti
o
n of fe
t
ch,
p
ull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree