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
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
2007-05-09
Theo
d
ore Ts'o
I
n
c
rease
p
ack
.
d
e
pth default t
o
50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theod
o
re
T
s
'o
Add pack
.
d
e
pth option
t
o gi
t
-
pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rename warn() to
wa
r
ni
n
g() to fix sy
m
bol con
f
licts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theo
d
ore Ts
'
o
merge
t
ool: Clean
u
p description of fil
e
s and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
m
e
r
getool: Make gi
t
-rm quiet when
r
esol
v
ing
a
del
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Add sup
p
ort for Apple Ma
c
OS X's op
e
ndi
f
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
m
er
g
etool
:
Fix abort com
m
and when
resolvi
n
g
symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erget
o
o
l: Remove
s
purious
e
r
ror
m
essage if mer
g
e
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
m
e
r
ge
t
ool: factor out common
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
T
s'
o
m
ergetool: po
r
tability fix: don'
t
u
se reser
v
ed word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'
o
mergetool: port
a
bilit
y
fix: don't assume true
is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
or
e
Ts'o
mergetoo
l
: Don
'
t error out in the mer
g
e
case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergeto
o
l: Replac
e
u
s
e of "e
c
ho -n" with
p
r
int
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fi
x
minor formatting issue
in
man pa
g
e
f
or git-m
e
rgetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetool: print an ap
p
ropriate wa
r
ning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore
T
s'o
A
d
d
g
it
-
me
r
ge
t
o
o
l to run
a
n
appropri
a
te merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Th
e
odore
Ts'o
Add definition of <commit-ish> to the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
e
odore Ts
'
o
Allow
git
-
rem
o
te to update n
a
m
ed g
r
oup
s
of rem
o
tes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'
o
Add config
_
boolea
n
(
)
metho
d
to the Git
perl mod
u
le
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git-remote to update existing
remot
e
s by fetchi
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore Ts'o
Allow
al
i
ases to expand to
shell comm
a
nds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Th
e
odo
r
e Ts'o
Print
a
sane e
r
ror message if
an alias expa
n
ds to a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts
'
o
Fix formatting for ur
l
s sectio
n
of fetch, p
u
l
l
,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree