repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.8.1' into maint
2013-02-10
Da
v
id
A
guila
r
p4merge: fix printf u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
A
g
uila
r
difftool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
o
c: generate a list of valid merg
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
la
r
mergetool--lib: add
f
u
nctio
n
s
f
or fi
n
din
g
available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
m
ergetool--lib: impro
v
e the help te
x
t in g
u
e
ss_merg
e
_t
o
ol()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gu
i
lar
mergetoo
l
--lib: simplify command e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d Aguil
a
r
mergetools: simp
l
ify how we hand
l
e "vim" a
n
d
"defau
l
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguila
r
merget
o
o
l
--lib
:
improve show_tool
_
help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
la
r
mergetool
s
/vim: remove red
u
n
d
ant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uilar
me
r
getools/
p
4me
r
ge: Honor
$
TMPDIR
f
o
r the /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
l
a
r
mergetools/p4merge:
H
a
n
dle "/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Aguilar
mergetool-
-
l
ib: Allo
w
cus
t
om commands to ove
r
ride
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
g
i
tk: Rename 'tagcontents' to
'c
a
c
hed_
t
agcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
tk: Teach "
R
eread
references" t
o
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
i
d Aguilar
mergetool,difftool: Documen
t
-
-
t
oo
l
-hel
p
co
n
sistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
di
f
f
t
o
ol: D
i
sab
l
e
--symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid A
g
u
ilar
difftool:
Handle compare
(
)
r
etur
n
ing -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
A
g
u
ilar
diffto
o
l: W
r
a
p
lon
g
lines for reada
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all return c
o
des from
com
p
are()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vi
d
Aguilar
difftool: Handle findin
g
mergetools/
i
n a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
dif
f
tool: U
s
e sy
m
l
i
nk
s
w
h
en diffing ag
a
inst the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
d
iff
t
o
o
l:
C
all the temp directory "git-dif
f
to
o
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avi
d
A
guilar
difftool:
Move
o
ption v
a
lues into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftoo
l
:
Eliminate glo
b
al variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
difftool:
Simplify
prin
t
_tool
_
help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800
:
Test difftool
p
assing a
r
guments to
dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
mergetool: Provide
an e
m
pty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Make
f
ile: I
m
prove compiler h
e
ader
dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guil
a
r
mergetools/meld: Use '--output
'
when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
id Aguilar
m
e
r
get
o
ol--lib: Refac
t
or tool
s
into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
o
o
l--l
i
b: Make
style
c
o
nsist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
difftool--helpe
r
: Ma
k
e
style consistent
with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguilar
t
/t7503-pr
e
-commit-hook
.
sh: Add GIT_PREFIX test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetoo
l
--lib
:
Make
vimdiff re
t
ain th
e
c
u
rrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git:
R
emove handling for GIT_PR
E
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
s
etu
p
: Provide GIT
_
PREFIX to buil
t
-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
A
guil
a
r
s
u
bmodule syn
c
: Upda
t
e "s
u
bmodu
l
e
.
<
n
ame>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool:
Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docum
e
nta
t
i
o
n: Explain gi
t
-mergetool's
use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
M
a
kefile: Re
m
ove usag
e
o
f
d
e
p
r
ec
a
ted Python "h
a
s
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
diff
t
o
o
l:
F
ix '-
-
gu
i
' when
d
iff
.
gui
t
ool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguilar
t78
0
0
-
diffto
o
l
.
sh: Test mergetool
.
pr
o
mpt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftool: Update copyri
g
ht notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uilar
difftool: Use eval to expand
'--ex
t
cm
d
'
e
x
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
d
i
f
f
tool: Add '-x' and as an alias
f
o
r
'--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t78
0
0-difftoo
l
.
sh: Simplif
y
the --ext
c
m
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
git
-
d
i
ff
.
txt: Li
n
k t
o
g
i
t
-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Agui
l
ar
d
ifftool: Allow
sp
e
c
if
y
ing
unconfi
g
ured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
d
i
fftool--helper: Rem
o
ve
u
se o
f
the GI
T
_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--helper: Update co
p
yright
a
n
d rem
o
ve
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
g
i
t-difftool:
A
dd '--gui' for selecting a GUI
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t78
0
0-difftool: Set a bogus t
o
ol for us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unnecessarily loo
k
for
a
reposi
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
Agui
l
ar
sub
m
odule
.
c
: Squelc
h
a "use befo
r
e assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: g
e
nerate pretty filenames
i
n prep_tem
p
_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: ad
d
a
ba
s
ena
m
e()
compatibil
i
ty funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
comp
a
t: add a mkstem
p
s() co
m
patibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gu
i
lar
Ad
d
git-
r
e
p
lac
e
t
o
.
giti
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merg
e
tool--li
b
: a
d
d supp
o
rt
f
or ar
a
x
i
s me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
i
l
ar
mergetool--
l
i
b
:
s
peciali
z
e diff opti
o
ns for em
e
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid
Aguila
r
mergetool--lib: s
i
mpl
i
fy
A
PI usage by removing m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool/merge
t
ool: refactor
c
o
mmand
s
to use git-
m
ergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
m
e
r
getool: use
$
(
.
.
.
)
inst
e
ad of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
il
a
r
bash completion:
add git-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool
:
add support for a difftool
.
prom
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: a
d
d
v
ario
u
s
g
it
-
difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: mo
v
e 'git-difftool'
ou
t
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool
:
a
dd a
-y shortcut for --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftool:
use perl
bu
i
lt-ins whe
n
testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: remove
the
ba
c
kup file feat
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: r
e
move
merge o
p
t
ions for op
e
ndiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday:
use th
e
dashle
s
s
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguil
a
r
c
on
t
rib/difftool: use
a
se
p
arate con
f
ig names
p
ace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id
Aguilar
contrib/
d
ifft
o
ol: Don't repeat merge t
o
ol candidate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
: p
u
t the cur
s
o
r
on the editable
f
ile for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
difftool: fi
x
documentation
pro
b
lems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib
:
a
d
d
'g
i
t difftool' for launchi
n
g comm
o
n me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id A
g
uilar
git
-
m
ergetool: pro
p
e
rly
ha
n
dle "git mergeto
o
l -- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
A
guila
r
te
s
ts: add
a testcase for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agu
i
l
a
r
git-submodule: add "sync" comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d A
g
uilar
git-submodule: replace dup
l
icated code with a modu
l
e_
l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PA
T
CH] gitk: Don't show lo
c
a
l
changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree