repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitcli: parse-options lets you omit tail of long options
2012-09-09
David Agui
l
ar
gitk
:
R
en
a
me
'tagco
n
ten
t
s
'
to 'cached_tagcont
e
n
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
g
itk: Teach "
R
eread references" to rel
o
ad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Aguilar
t
7
800: Test di
f
ftool
p
assing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Ag
u
ila
r
merg
e
t
o
o
l: Provide an empty file when
n
e
e
ded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Make
f
ile: Impro
v
e c
o
mpiler header
d
e
pende
n
cy
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ols/meld: Use
'--ou
t
p
ut' when av
a
i
lable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Agu
i
lar
mergetool--lib: Ref
a
ctor tools
i
nto separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
m
e
r
get
o
ol-
-
lib: Ma
k
e
s
t
y
le co
n
s
istent wi
t
h
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguila
r
d
i
fftool--helper: Make style
c
onsistent w
i
th
gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Agui
l
ar
t/t7503-pre-commit-hook
.
sh: Add GIT_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Ag
u
ilar
g
it-
m
e
r
getoo
l
--lib: M
a
k
e
vimdiff
retain the curren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
h
a
n
dling for GIT
_
P
REFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide GIT_PR
E
FIX to bu
i
lt-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
s
ubmodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
i
d
A
g
ui
l
ar
m
e
r
getool: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documentation: Explain git-mergetoo
l
's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
A
guil
a
r
Makefile
:
Remove usage of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diffto
o
l: Fix '--gui'
wh
e
n diff
.
guitool is unconfi
g
ured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David A
g
ui
l
a
r
t7800-dif
f
tool
.
sh: Test m
e
rgetool
.
prompt
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
difftool: Update copyr
i
ght
n
otices to list each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
o
o
l: Use eval
to expand '--extcmd'
expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguil
a
r
difftool: Add '-x' and as an al
i
as fo
r
'
-
-extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
t
7
800-difftool
.
s
h
:
S
i
mplif
y
the
-
-ext
c
md t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
x
t
: Lin
k
to
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
dif
f
tool: Allow specifyi
n
g unconfig
u
red c
o
m
m
ands
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
di
f
ftool--helper: Remove use of the GIT_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d A
g
uilar
d
iff
t
o
o
l
--helper
:
Upda
t
e co
p
yright and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
git-
d
ifftool: Add '--gui' f
o
r sele
c
ting a GUI
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
av
i
d Aguil
a
r
t7
8
00-
d
ifftool: Set a bogus t
o
ol for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
lp
:
Do not unnecessarily look for a re
p
osit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid A
g
u
i
l
a
r
submodule
.
c: Squelch
a
"use before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
: generate pretty filename
s
in
p
rep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: add a basena
m
e() compatibility
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
g
uilar
compat: add a mkstemps()
c
o
mpatibility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-rep
l
ac
e
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid A
g
u
ilar
mergetool--lib: add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguilar
mergetool--lib: s
p
e
c
i
alize diff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Agu
i
lar
mergetool--lib
:
simpl
i
fy API usa
g
e by
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/me
r
getool: refa
c
tor command
s
to use git-mer
g
etool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mer
g
etool: use $(
.
.
.
) i
n
ste
a
d of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash complet
i
o
n
:
ad
d
g
it
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
ar
d
i
fft
o
ol: a
d
d
sup
p
ort for
a diff
t
ool
.
prompt con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
di
f
ftoo
l
: add var
i
ou
s
git-difftool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
o
o
l: move '
g
it-difftool'
o
ut
o
f c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difft
o
ol
:
add a -y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
di
f
ftool
:
u
se
perl built-
i
n
s
when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
di
f
ftool: rem
o
ve th
e
backup fil
e
featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: re
m
ove me
r
ge optio
n
s for
o
pendif
f
, tkdif
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday
:
us
e
t
h
e
dashless f
o
r
m
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Agu
i
l
a
r
cont
r
ib/difftoo
l
: use a separate config namespace f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
u
ila
r
contrib
/
difftool: Do
n
't repeat merge tool candidate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguil
a
r
difftool: put the cursor
o
n the editabl
e
file
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Agu
i
l
ar
d
i
fft
o
o
l
:
fix documentation probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
i
d
Aguila
r
contrib: add 'git diffto
o
l' for la
u
nching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguila
r
git-mergetool: properly han
d
le "git mergetool
-
- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Aguilar
t
e
sts: add
a
testcas
e
for "
g
it s
u
b
modu
l
e sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
g
it-submodu
l
e: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Aguila
r
git-submodule: replace duplicated code with a m
o
d
ule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk
:
Don't show
l
oc
a
l c
h
anges
w
hen we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree