repo.or.cz
/
git
/
raj.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
David A
g
uilar
git
-
merge
t
ool--
l
ib:
Make vimdiff retain the
c
ur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git: Rem
o
ve handling for
G
I
T
_
PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
guilar
setup: Pro
v
i
de
G
IT_PR
E
FIX to built
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguilar
submodule sync: Update "
s
u
b
m
odule
.
<name>
.
ur
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
Documentat
i
o
n
:
Explain git-m
e
rget
o
ol'
s
use of temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefi
l
e: R
e
mov
e
u
s
age of deprecated Pyth
o
n "
h
a
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
difftool
:
F
ix '--
g
ui' when diff
.
guitool is
unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guilar
t7
8
00
-
difft
o
ol
.
sh: Test m
e
rgetool
.
p
r
ompt fallbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid A
g
uilar
difftool: Update copyrig
h
t
n
otices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
i
lar
diffto
o
l: U
s
e
e
val to e
x
pan
d
'--
e
xtcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id A
g
ui
l
a
r
di
f
ftool: Add '-
x
'
and as an
a
lias f
o
r '--ex
t
cmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uilar
t7800-di
f
ftoo
l
.
sh
:
Simplif
y
the --extcm
d
tes
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
guilar
git-d
i
ff
.
txt:
L
ink to git-
d
ifft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguil
a
r
d
i
ffto
o
l: Allo
w
specifying u
n
configured com
m
ands
w
i
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguila
r
di
f
ftool--helper
:
Re
m
ove
u
s
e
o
f
t
he
G
I
T
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
i
la
r
difft
o
ol--h
e
lper: Update co
p
yright
a
n
d
r
e
move distract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguil
a
r
git-diff
t
ool: Add '--gui' f
o
r sele
c
t
i
n
g a GUI t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
t780
0
-dif
f
tool: Set a bogu
s
to
o
l
for use by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id
Ag
u
i
la
r
help: Do n
o
t
unnecessarily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
ar
submo
d
ule
.
c: Squelch a "use before
assignment
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
ar
diff: generate
pretty filen
a
mes
in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
co
m
pat:
a
dd a
ba
s
ename() compa
t
ibility f
u
nctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mk
s
t
e
mps()
compatib
i
lity f
u
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
Add git-rep
l
ace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
gui
l
ar
mergetool
-
-l
i
b
:
a
dd suppor
t
for araxis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avi
d
Aguilar
mer
g
eto
o
l
--lib: spe
c
ialize
d
i
ff options for emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetoo
l
--lib: simplif
y
API
u
s
age by
removi
n
g
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
t
ool/mergetool:
ref
a
ctor
command
s
t
o
use git-m
e
rget
o
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguila
r
mergetool
:
use $(
.
.
.
)
i
ns
t
ead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash com
p
leti
o
n: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add
s
upport f
o
r
a dif
f
tool
.
prompt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add var
i
ous git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguila
r
d
iff
t
ool: move 'git-di
f
ftool' ou
t
of co
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: add a -y shortcut for
-
-n
o
-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
difft
o
ol:
u
se perl b
u
ilt-ins
when
testing for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
di
f
ftool: remove the
backu
p
f
ile feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool:
remove merge op
t
i
o
ns for
o
pendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
i
d Aguilar
eve
r
yday: use the dashless f
o
rm of
git-ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Agui
l
ar
contri
b
/
d
ifftoo
l
:
us
e
a
s
eparat
e
conf
i
g namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/diff
t
ool:
Do
n
't
r
e
peat merge
too
l
can
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put
t
he cursor on the editable fil
e
f
o
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d Aguilar
di
f
ftool: fix d
o
cumentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'git
difftool' f
o
r
l
aunchin
g
common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-merget
o
ol: prop
e
rly
ha
n
dle "git merg
e
t
ool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase
fo
r
"git submodule s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
git-s
u
bmodule: add "sy
n
c" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git
-
submodule: replace duplica
t
ed code with
a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
A
g
uilar
[P
A
TCH] g
i
tk
:
Don't show local chan
g
e
s
whe
n
we
th
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree