repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 1.6.3-rc4
2009-04-12
David Aguilar
merge
t
o
o
l
--lib: simplify API usage by removi
n
g mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
tool/mergetool: re
f
actor
c
o
m
mands to
u
se git-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
merg
e
tool: use $(
.
.
.
) instea
d
of `backt
i
ck
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguilar
b
a
sh completion: add git-d
i
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
dif
f
too
l
: add su
p
port for a difft
o
ol
.
prompt co
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add various git-difft
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
di
f
ftool: move
'
g
it-difft
o
ol'
out of con
t
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difftool:
a
dd a -y sho
r
tcut
f
or --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
difftool: use p
e
rl built-ins w
h
en
testin
g
f
or msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gui
l
ar
d
i
fftool: remov
e
the
b
ackup
file fea
t
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove
m
e
r
ge options for opendiff,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
u
i
l
ar
ev
e
ryday: us
e
the dashless fo
r
m of g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguilar
co
n
trib/difftool: u
s
e a separate config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
ontrib/difftool: Don't rep
e
at
merge tool candid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
:
p
u
t
t
h
e cursor on th
e
editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Agu
i
lar
diffto
o
l: fix
d
o
c
u
m
ent
a
t
io
n
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id A
g
uilar
c
ontri
b
:
a
dd 'git difftool' for l
a
un
c
hing com
m
on me
r
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
i
d Aguilar
git-mergetool: properl
y
handle
"git merge
t
ool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tes
t
s:
a
dd a testcase for
"
gi
t
s
u
b
module syn
c
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-su
b
modu
l
e:
a
dd "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
submodule:
replace du
p
licated code
w
ith a modul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
u
i
lar
[PATC
H
]
g
it
k
: Don't sh
o
w l
o
cal changes when
w
e there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
