repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7800-difftool: Set a bogus tool for use by tests
2010-01-03
Da
v
id Aguilar
t
7800-difftool: Set a bogus tool
f
o
r use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
help
:
Do not u
n
necessarily
l
ook
for a rep
o
sitory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
mo
d
ule
.
c
: Squ
e
l
ch a "
u
se b
e
fore assig
n
men
t
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff:
g
e
nerate pretty filen
a
mes in p
r
ep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a basename() co
m
patibility functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
c
ompa
t
: add a
m
kste
m
p
s()
c
o
m
pa
t
ib
i
lity f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add gi
t
-repla
c
e to
.
gitign
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib:
add support f
o
r ar
a
xis
m
erg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Ag
u
ilar
m
erg
e
tool
-
-lib: s
p
ecialize
diff options fo
r
e
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id A
g
u
ilar
mergetool--lib: simplif
y
API usag
e
by removi
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetoo
l
: refact
o
r comman
d
s to use gi
t
-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool: use $
(
.
.
.
) inste
a
d of `back
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
l
a
r
bash co
m
p
l
e
tion:
a
dd git
-
diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
il
a
r
diff
t
ool:
ad
d
s
u
pport for a
d
i
fftool
.
p
r
ompt c
o
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
difftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
i
f
f
t
ool: move 'git-difftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
di
f
ftool: a
d
d
a -y shortcut
f
or
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ila
r
d
ifftool: use
p
erl built-ins when testi
n
g for
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
difftool:
remove the
b
a
ckup fil
e
fea
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
difftoo
l
: remove merge opt
i
ons f
o
r
o
p
e
n
d
iff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Ag
u
ilar
e
veryday: us
e
the dashless
f
orm of
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
contrib/difftool: u
s
e a sepa
r
a
te config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
i
d
A
g
uilar
contrib/difftool: Don't repeat merge tool cand
i
d
at
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool:
put th
e
cursor on the editable file for
V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
difft
o
ol: fix do
c
umentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
id Aguilar
c
ontrib: add 'g
i
t difftool' for l
a
unching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
Agu
i
l
ar
g
it-merget
o
ol: prop
e
rl
y
handle
"
g
it mergetool -- filen
a
me
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
gui
l
ar
t
e
sts: add a testcase for "git subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add
"
syn
c
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
l
a
r
git-s
u
bmodule: re
p
lace duplicated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Ag
u
ilar
[PATC
H
] gitk: Don'
t
s
h
o
w loc
a
l
changes
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree