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
difftool--helper: Make style consistent with git
2011-08-19
Dav
i
d Aguilar
difft
o
ol--h
e
lper:
M
ake style
con
s
i
s
t
e
n
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
lar
t/t7503-pre-commit-h
o
ok
.
sh
:
Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git-mergetool--li
b
: Make
vimdiff retain the cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
g
i
t: Remove handling f
o
r GIT
_
PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
set
u
p: Pro
v
ide
GIT_P
R
EFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
av
i
d Aguilar
s
ub
m
odule
s
y
n
c: Update "submo
d
ule
.
<name>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Agui
l
ar
me
r
getool:
Ski
p
autor
e
solved
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
D
o
cum
e
ntat
i
o
n
: Expla
i
n git-mergetool'
s
u
se of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefi
l
e
:
Remo
v
e usage of d
e
precated
P
y
t
h
o
n
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
diff
t
ool: Fix '-
-
g
u
i
' w
h
en d
i
ff
.
gu
i
tool
i
s
u
n
con
f
igured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t78
0
0
-difftool
.
sh: Te
s
t m
e
rge
t
ool
.
p
r
ompt
f
allb
a
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David
A
g
uila
r
difftool: U
p
date c
o
pyr
i
g
ht notices t
o
l
ist
each
ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uila
r
difftool: Use eval to expand '--extcmd
'
e
xpres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
ol: Add '-x
'
a
n
d
as
a
n alias for
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t
7
800-
d
i
ff
t
ool
.
sh: Simp
l
ify
the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
git-diff
.
txt:
Link to gi
t
-
diff
t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Agu
i
l
ar
dif
f
tool: Allow specifying unconf
i
g
ured c
o
mmands w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
a
r
difftoo
l
--
h
elper:
Remove use
o
f the
G
I
T
_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguil
a
r
difftool--helper
:
Update c
o
pyright and remove dist
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
g
it-
d
i
f
ftool
:
Add '--g
u
i' for se
l
ecting
a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t780
0
-difftoo
l
:
Se
t
a
bog
u
s
tool for use by test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not
unn
e
ce
s
s
arily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguila
r
s
ubmo
d
u
le
.
c: Squelch a "us
e
before assignment" warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generat
e
pretty filenames in p
r
e
p
_temp_b
l
ob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id
A
guilar
comp
a
t: add a basename()
compat
i
b
i
lity fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
comp
a
t: add a mkstem
p
s() compatibility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Add git-
r
eplace t
o
.
g
i
tig
n
or
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
m
e
r
g
etool--lib:
add
s
uppor
t
for
ar
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
mer
g
e
tool--lib: special
i
ze d
i
ff optio
n
s for emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguilar
mergetool--lib
:
simpl
i
fy API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difft
o
ol/mergetool:
refactor comma
n
ds to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
merg
e
tool: us
e
$
(
.
.
.
) instead of `ba
c
k
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash
c
ompletio
n
:
add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
A
guila
r
difftool: ad
d
sup
p
ort for a d
i
f
ftool
.
prompt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
di
f
ftool:
a
dd vari
o
us git-di
f
ftool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol: move 'git-difftool' out o
f
c
ontrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
dif
f
too
l
: add a -y shortcu
t
for --no-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool
:
use perl built-
i
ns w
h
en tes
t
ing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
r
emove
t
h
e backup file
f
e
atur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diff
t
ool: remove merge options f
o
r
o
pendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
everyday: use the dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguilar
c
o
ntrib/difftoo
l
: use a
sepa
r
at
e
conf
i
g
nam
e
spa
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/dif
f
tool:
D
on't repe
a
t merge tool candida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difftool:
p
u
t
the c
u
rsor on
t
he editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diffto
o
l
:
fix docu
m
e
n
tati
o
n problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguila
r
contrib
:
ad
d
'git diff
t
ool' for launchin
g
co
m
mon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly
handle "g
i
t mergeto
o
l -
-
filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agui
l
ar
tes
t
s: add
a te
s
t
c
a
s
e
for "git
submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
git-su
b
m
odule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
it-submodule: r
e
plac
e
duplicated code with a module_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
A
g
uila
r
[P
A
TCH] gitk: Don't show local ch
a
nges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree