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--lib: Make vimdiff retain the current directory
2011-05-26
D
a
vid Agui
l
a
r
git-mergetool--lib: Make vimdiff retain the cu
r
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Ag
u
ilar
git: Remove handl
i
ng for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Pr
o
vide GIT_PREFIX to buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
s
u
bm
o
d
u
le sync: Update "submodul
e
.
<
n
ame>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
l
a
r
mergetoo
l
: Skip au
t
oresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Expl
a
in g
i
t-mergetool's
u
se of tempo
r
ar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Aguilar
Makefile: Remove
u
s
age of deprecated Py
t
ho
n
"
h
a
s_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fi
x
'--gui' when diff
.
g
uitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ila
r
t
7
800
-
diff
t
ool
.
s
h
: Test
m
ergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Aguilar
difftool:
Update c
o
pyright n
o
tices to
list eac
h
y
e
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
l
a
r
d
iff
t
o
o
l: U
s
e eva
l
to
e
x
pand '--e
x
tcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d Aguilar
difftool: A
d
d '-x' and as an alias
f
or '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: Simplify the --e
x
tcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
gi
t
-
d
iff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
t
ool: Allow specifyi
n
g unc
o
n
figured commands
w
i
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--
h
elper: Remove
use o
f
the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--
h
elpe
r
: U
p
date copyright an
d
remove dis
t
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
git-difft
o
ol:
Ad
d
'--gui' for selecting
a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7800-difftool:
Set a bogus tool
for use b
y
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
help: Do not unnecess
a
rily l
o
ok for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submodu
l
e
.
c: Squelch a "u
s
e before as
s
ignment"
warn
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguilar
diff: generate
pretty file
n
ames
i
n prep_t
e
mp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agu
i
lar
compat:
ad
d
a basename() c
o
mpatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguila
r
compat
:
add a m
k
stemps() compatibility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-rep
l
ace
t
o
.
giti
g
n
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
ergetool
-
-lib: add
s
u
p
p
ort
f
o
r
araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguilar
mer
g
e
tool--
l
ib: sp
e
cia
l
ize diff optio
n
s
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguilar
mergetool--lib: simplify
API usage b
y
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
a
r
dif
f
tool/mer
g
etool:
r
e
f
actor commands
to u
s
e g
i
t-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
etool: us
e
$(
.
.
.
) i
n
s
tead of
`backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
bash completion: add
git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: add support for a di
f
fto
o
l
.
prompt conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftoo
l
:
a
dd
v
a
rious git-difftool
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
difftool: move 'gi
t
-difftool' out of con
t
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool:
a
dd a -y shortcut
for --no-pr
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: use per
l
b
uilt-ins when testing
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool: remove the b
a
ckup file
f
e
atu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftoo
l
:
remove merge options for
o
pen
d
iff, tkd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Aguilar
ev
e
ry
d
ay: use th
e
dashless form of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguilar
contrib/d
i
fftool:
u
se a sepa
r
ate conf
i
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Agu
i
lar
contrib/difftoo
l
:
Don't repeat
merge tool candida
t
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool: put the cur
s
o
r
on the editable f
i
le for V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
to
o
l:
fix documentation
p
r
o
blems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Aguilar
c
o
n
t
rib: add 'git d
i
fftool'
f
or l
a
unching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
A
g
uilar
git-
m
ergetoo
l
: prop
e
rly handle
"git mergetoo
l
-- filenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests:
a
dd a testcase
for "git submod
u
le
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Agu
i
lar
git-submo
d
u
le
:
replace duplicated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
A
gui
l
a
r
[
P
ATCH]
g
itk:
D
on
'
t show loca
l
chan
g
es when w
e
ther
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree