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
Documentation/git-stash.txt: add a missing verb
2012-10-11
Da
v
id Aguilar
merge
t
ools/p4merge: H
a
nd
l
e "/d
e
v/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merget
o
ol--
l
ib:
A
l
low custom com
m
ands to
o
v
erride b
u
i
lt-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d
A
g
ui
l
ar
gitk:
R
enam
e
'
t
agcontents' to 'cached_tag
c
o
n
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
u
i
lar
gitk: Te
a
ch
"Reread ref
e
rences" to re
l
o
ad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool
:
Docume
n
t --tool
-
help consi
s
te
n
tly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uila
r
difftool: Disable --symlink
s
o
n
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difft
o
ol: Handle compar
e
() retur
n
ing -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d
Aguilar
diffto
o
l: Wrap long lines
for r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
difftool: Check all
return c
o
des from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Handle findin
g
merg
e
t
o
ols/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
ftool: Use symlinks
w
hen di
f
fin
g
agains
t
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguil
a
r
difftool: Call the te
m
p dir
e
ctory "git-di
f
fto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
diffto
o
l: Mo
v
e option values into
a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftoo
l
: Simplify print_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
lar
t
7800: Test d
i
f
f
t
o
ol pa
s
sing argume
n
ts
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguil
a
r
merg
e
tool: Provide an empty file when need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguil
a
r
Makefile:
Imp
r
ove compil
e
r he
a
de
r
depende
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
ge
t
o
ols/meld:
U
se
'
--ou
t
put' wh
e
n available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
merg
e
tool-
-
l
i
b: Refa
c
tor
t
o
o
l
s into se
p
arat
e
f
il
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
merget
o
ol-
-
l
i
b
:
Make style consistent
w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
difftool--helpe
r
: Make
s
tyl
e
consist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguila
r
t/t7503-pre-commit-
h
ook
.
sh: Add
GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool-
-
li
b
: Make v
i
mdi
f
f retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git: Remove
h
andling for GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agui
l
ar
set
u
p
: Provi
d
e
GIT_PREFIX to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
A
guilar
submodule sy
n
c
: Upda
t
e "submodule
.
<name
>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rgetool:
Skip auto
r
eso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docu
m
entation: Explai
n
g
i
t-mergetoo
l
'
s
use
o
f temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefile: Remove usage of deprecated Python "has_
k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguila
r
difftool: Fi
x
'--
g
u
i
'
when
diff
.
guit
o
ol is uncon
f
igured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t7800-diffto
o
l
.
sh: Test
mergetool
.
promp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d Aguil
a
r
d
i
f
ftool: Upda
t
e c
o
pyr
i
ght notices to li
s
t e
a
ch year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
U
se eval
to exp
a
nd
'--extcm
d
' exp
r
ess
i
on
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: Ad
d
'-
x
' and as an a
l
i
a
s for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Agu
i
lar
t7800-diff
t
ool
.
sh:
S
implify the --extcm
d
t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
git-di
f
f
.
tx
t
:
L
i
n
k
to
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifying unconfigured
command
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Agu
i
lar
difft
o
ol--helpe
r
: R
e
move
use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-
h
elper: Update copyright and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
git-diff
t
ool: Add '
-
-
gui' for sel
e
cting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-di
f
f
t
ool: Set a bogus tool for us
e
by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d
Agu
i
la
r
help: Do n
o
t
unnecess
a
rily look for a repo
s
i
t
o
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c: S
q
uelch a
"use bef
o
re assignment" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
di
f
f:
g
enerate pretty filenames in p
r
e
p_temp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
a
dd
a
basename
(
) com
p
atib
i
lit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
c
o
mpat: ad
d
a mkstemps() compatibility func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add s
u
pport for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agu
i
lar
m
ergetool--lib: special
i
ze
d
i
ff optio
n
s for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguil
a
r
m
e
rge
t
ool--lib: simpl
i
fy
A
P
I usage
by rem
o
ving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
ool/merg
e
tool:
refactor co
m
m
a
nds to us
e
g
i
t
-me
r
get
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
mergetool: use $(
.
.
.
) instead
of `backti
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
c
omp
l
etion: add git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
gu
i
lar
difftool: add s
u
pp
o
rt for
a d
i
f
f
tool
.
pr
o
mpt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various git-
d
ifftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
i
ffto
o
l:
m
ove 'git-diff
t
ool
'
out
o
f contri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool
:
add a -y s
h
ortcut
f
or --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difft
o
o
l: use per
l
bui
l
t-
i
ns when test
i
n
g
for m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
d
i
ff
t
oo
l
:
remo
v
e the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
d
i
fftool: remov
e
m
e
rge options for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
e
v
e
ryday: use the d
a
shless form o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid
A
guil
a
r
c
o
ntrib/d
i
fftool:
u
se a sep
a
rat
e
conf
i
g
namespace
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
cont
r
ib/difftool: Don't repea
t
mer
g
e
tool cand
i
dates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
d
i
fftool: pu
t
the
c
ursor on
t
he
e
di
t
able
f
ile for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
oo
l
: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
co
n
trib:
a
dd
'
git
d
ifftoo
l
' for la
u
nching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: prope
r
ly
handle "git merg
e
tool -- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
t
es
t
s
: add a testcase f
o
r
"
g
it s
u
bmod
u
le sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Ag
u
i
l
ar
git-submodule: add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
uilar
git-s
u
b
modul
e
: re
p
la
c
e
duplica
t
ed code with a
m
od
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agu
i
la
r
[PATCH
]
gitk:
D
on't show local cha
n
g
e
s
w
h
e
n w
e
t
h
e
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree