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
mergetools/p4merge: Handle "/dev/null"
2012-10-11
D
a
vid Agui
l
ar
merge
t
ools/p
4
merge: H
a
ndl
e
"/de
v
/
n
ull"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename 'tagcon
t
e
n
ts' to '
c
ac
h
ed_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Teach "Rer
e
ad refe
r
ences" t
o
reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t7800: Test
difftool
p
a
ssing argu
m
e
n
ts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d
Aguilar
merg
e
tool: Provide an e
m
pty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguil
a
r
M
a
kefile: Imp
r
ove co
m
piler he
a
der
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
m
e
rgetools/meld: Use '--out
p
ut' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mergetool
-
-lib:
Refactor too
l
s into s
e
p
a
rat
e
fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ol--lib: Make style cons
i
stent wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
dif
f
tool--helper: Make
s
tyle consistent with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
ilar
git-mergetool--lib: Make vim
d
iff
r
e
tain the c
u
r
re
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git: Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
se
t
up: Provi
d
e GIT_PREFIX t
o
built
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguilar
s
ubmodu
l
e
sync: U
p
da
t
e "submod
u
le
.
<name>
.
ur
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ilar
mergetool
:
Sk
i
p
a
utor
e
solv
e
d paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
D
o
c
ument
a
tion: Expl
a
in git-mergetool's use of te
m
p
orary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile:
R
emove usag
e
of d
e
p
rec
a
ted Pyth
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
difftool
:
F
i
x
'
--gu
i
'
when
d
if
f
.
guitool is
unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Agu
i
lar
t
7
800-difftool
.
sh: Tes
t
mergetool
.
prom
p
t
f
allback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftool:
U
pdate
copyright
n
otices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
Use eva
l
to expand '--ex
t
cmd' expre
s
si
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid
Aguilar
d
i
f
ftool:
A
d
d '-x
'
and
a
s an alias
f
or '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t
7
8
00
-
difftoo
l
.
s
h: Simpli
f
y
the --extcmd
t
est
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-diff
.
t
x
t: L
i
nk to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vi
d
Agu
i
lar
di
f
ftool: Allow speci
f
ying unconfigured
com
m
a
nds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool--hel
p
er: Remov
e
u
s
e
of the G
I
T_
M
ERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Agui
l
a
r
difftool--helpe
r
: Up
d
ate copyright and rem
o
ve distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--gui'
f
o
r selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
A
g
u
il
a
r
t7800-di
f
ftool: Set a
b
ogus
tool for use by
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help
:
Do not u
n
nec
e
s
s
a
r
ily look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubm
o
dule
.
c: Squelch a "u
s
e be
f
ore as
s
ig
n
men
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: g
e
n
erate
pretty filen
a
mes in pre
p
_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguilar
c
o
mpat: add a basen
a
me()
compatibi
l
ity functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat
:
add a
mkstemps
(
)
comp
a
t
i
b
ility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guila
r
Add
git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
m
ergetool--lib: add s
u
pp
o
rt for
araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
m
e
r
getool--lib: spe
c
ialize diff op
t
ions
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid A
g
uila
r
merg
e
tool--lib:
simplify API u
s
ag
e
by remo
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
ifft
o
o
l
/
m
erge
t
ool: ref
a
ctor commands to use git
-
merget
o
ol
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merg
e
tool
:
use $(
.
.
.
) instead
o
f
`b
a
ckticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
uilar
bash
complet
i
o
n
:
a
dd
git
-
difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diffto
o
l
:
add supp
o
rt for
a
di
f
ftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Aguilar
difftool: ad
d
va
r
ious git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-difftool
'
out of cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
ool: a
d
d
a
-y shortcut f
o
r
--no-prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agu
i
lar
difftool: use per
l
b
ui
l
t-ins when testin
g
f
o
r
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftoo
l
:
r
emove the
backup fil
e
featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: remo
v
e merge options for opendi
f
f, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
everyday: use t
h
e
dash
l
ess form
o
f
git
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Agu
i
lar
contrib/difftoo
l
:
u
s
e
a se
p
ara
t
e config namesp
a
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
i
l
ar
c
o
ntrib/difftool: Don't repeat
m
erg
e
t
ool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
t
ool: pu
t
the cu
r
sor on the
editab
l
e file
for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
t
o
o
l: fix
d
o
cu
m
entat
i
on problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid A
g
uilar
con
t
rib: add 'git diff
t
ool' for laun
c
hing com
m
on me
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guil
a
r
git-me
r
getool: properly han
d
le
"
git m
e
rgetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
t
e
sts: add a testcase for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submodule: add "sync" comma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-submodu
l
e
:
replace duplicated
c
ode with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Agu
i
lar
[PATCH] gi
t
k: Don't show
l
ocal chang
e
s whe
n
w
e
the
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree