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
Merge branch 'rr/git-uri-doc'
2012-09-25
David Aguilar
mergetool--lib: Allow
custom commands
to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gi
t
k: Re
n
ame 'tagcontents' to 'cached_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
uilar
gitk: Teach
"Re
r
ead ref
e
renc
e
s" to reload
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
Agui
l
ar
mergetool,difftool: Docu
m
ent --tool
-
help
c
onsistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Di
s
able --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Hand
l
e c
o
mpare() returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
Aguilar
diffto
o
l: W
r
a
p long lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
la
r
difftool: C
h
eck all return co
d
e
s
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguilar
difftool:
Handle findi
n
g me
r
get
o
ol
s
/ in a pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d A
g
uilar
diff
t
ool:
U
se symlinks when diffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
lar
dif
f
tool
:
Ca
l
l the te
m
p directory "git-dif
f
t
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
ftool: Move opt
i
on values into
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Ag
u
ilar
difft
o
ol: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
d
i
f
f
t
ool:
S
implify print_too
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
78
0
0: Test
dif
f
t
ool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
merg
e
tool
:
P
r
ovide an emp
t
y file when neede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Mak
e
file:
Improve co
m
pile
r
h
eade
r
d
e
pendency c
h
eck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/me
l
d
:
U
s
e '
-
-outpu
t
' when av
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergetool--lib: R
e
factor to
o
ls into separat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergetool-
-
l
i
b: Make style consis
t
ent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
ui
l
ar
difftool--hel
p
e
r
: Ma
k
e style consistent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t/t7503-pr
e
-co
m
m
it-
h
ook
.
s
h: Add
G
IT_PRE
F
IX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
gu
i
lar
g
i
t-mergetool-
-
lib: Make vi
m
diff r
e
ta
i
n
t
he current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Agui
l
ar
git: Remove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Agu
i
lar
setup: Prov
i
d
e GIT_
P
R
E
FIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
bmodule sync
:
Update
"
submod
u
le
.
<name>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
mergetool: Skip autoresolved
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Agui
l
ar
Doc
u
mentation: E
x
plain git-m
e
r
getool's use
of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
avid
A
g
uilar
Make
f
ile: Rem
o
v
e usage of
dep
r
ec
a
ted Pyt
h
on "ha
s
_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguil
a
r
diff
t
ool: Fix '--gui' when di
f
f
.
guitool is
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid
Aguilar
t7800-di
f
ftool
.
sh: Test merg
e
t
oo
l
.
prompt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
A
guilar
difftool:
Update copyright notice
s
t
o
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
d
ifftool:
U
se
e
val t
o
exp
a
n
d '--extcmd'
expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
diff
t
ool:
Add '-x' and as an alias for '-
-
extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Agui
l
ar
t7800-dif
f
tool
.
sh: Simplify th
e
--
e
xtcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
txt: Li
n
k to git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guila
r
difftool: Allo
w
specifying
un
c
onfigured
co
m
mands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
a
r
difftool--h
e
lper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper
:
Up
d
at
e
copyright a
n
d
remo
v
e distra
c
ti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
git-difftool: Add
'--gui' for
s
electing a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Agu
i
lar
t7
8
00-diffto
o
l
: Set a bogus tool for use by t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do
not unnecessarily look
f
or a reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
i
lar
submodule
.
c: Squelc
h
a "use before assignment" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
generate prett
y
filenam
e
s
in pr
e
p_te
m
p_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
add
a
b
a
sename
(
) compati
b
i
lity func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Agu
i
lar
compat: ad
d
a
mk
s
temps(
)
compatibili
t
y function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
Add git-replac
e
to
.
gi
t
ig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
mergetool--lib:
a
dd
suppo
r
t for
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merget
o
ol--
l
ib: specializ
e
d
iff
o
pt
i
ons f
o
r emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Aguilar
me
r
getool--lib: simplify API
usage by r
e
moving
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool/mergetool: refac
t
or commands to
u
se g
i
t-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetool:
u
se $(
.
.
.
) i
n
s
t
e
ad
o
f `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
bash co
m
pletion: add git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
fftool: add
support for a
d
ifftool
.
prom
p
t con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d A
g
uilar
d
ifftool: add various git-d
i
f
ftool te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
difftoo
l
: move 'gi
t
-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
d
i
fftool:
a
dd a -y shortcut for --no-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
dif
f
too
l
:
use
p
e
rl
b
uilt-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
difftool: re
m
ove the
b
ackup file
f
e
atu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
:
remove merge options for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
eve
r
yda
y
: u
s
e
the dashl
e
ss form of g
i
t-in
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
A
gui
l
ar
contrib/
d
i
f
ftoo
l
: use a
separa
t
e co
n
fig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
u
i
lar
c
on
t
r
i
b/diff
t
ool: Don't rep
e
at merg
e
tool cand
i
date
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
dif
f
to
o
l: put t
h
e
cursor on t
h
e editable file for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Agui
l
ar
d
ifftool
:
fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id
A
guilar
con
t
rib: add 'g
i
t diffto
o
l' for launching common
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly handle
"
g
i
t
m
erge
t
o
ol -- filename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
tests:
a
d
d a testcase for
"
git submodule
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id
Agui
l
ar
git-submodule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
g
it
-
submodule:
r
eplace dupl
i
cated
code with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
P
ATCH] gitk:
D
o
n
't show loc
a
l
chang
e
s when
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree