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
Merge branch 'nd/grep-true-path' into maint
2012-10-11
David Aguilar
mergetools/p4mer
g
e: Handl
e
"/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d
A
guila
r
mergetool--lib: All
o
w
c
ustom co
m
m
a
nds to overri
d
e
built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcon
t
ents'
to 'cached_t
a
gco
n
t
e
n
t'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
gitk:
T
each "
R
eread referenc
e
s"
t
o
r
e
l
oad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
erget
o
ol,difftoo
l
:
Docu
m
ent --tool
-
help
consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gui
l
ar
d
i
ff
t
ool:
D
is
a
ble --sym
l
inks on
cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle compare(
)
r
eturning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftool
:
Wrap
l
o
ng
l
in
e
s for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difftool
:
C
h
e
c
k all return
codes from
compar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle fi
n
ding merg
e
to
o
l
s/ in
a
pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: U
s
e symlinks when dif
f
ing against the wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Call the t
e
mp directory "git-difftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Ag
u
ilar
difftool:
M
o
v
e o
p
t
i
o
n
values
i
nt
o
a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: E
l
iminate glob
a
l variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: S
i
mplify pri
n
t
_
tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d
Aguilar
t7800: Test di
f
ftool
passing argum
e
n
ts t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Agu
i
l
a
r
mergetool:
P
r
ovide an empt
y
file when need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
id A
g
uil
a
r
Makefile
:
Imp
r
ove compiler he
a
de
r
depende
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
Aguilar
mergetools/m
e
ld:
Use '--output'
w
hen availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
mergetool--lib
:
Refac
t
or too
l
s i
n
t
o
se
p
arat
e
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merge
t
ool-
-
lib:
M
a
k
e style consi
s
tent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Ag
u
ilar
difftoo
l
--he
l
p
er: Make st
y
le consistent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
u
ilar
t/t7
5
03-pre-commit-
h
ook
.
sh
:
Add GIT_PREF
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git-mergetool--lib:
Make
vimdiff retain
t
he
c
urrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguila
r
git: Remove handling for GI
T
_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setu
p
: Provide
G
IT_PREFIX t
o
b
u
ilt-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
su
b
m
o
dul
e
sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
lar
mergetool:
S
kip aut
o
re
s
olved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Expla
i
n
g
it-m
e
rgeto
o
l's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefi
l
e:
R
emove u
s
age of
d
eprecate
d
Pytho
n
"
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fi
x
'--gui' when diff
.
guito
o
l
is u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Te
s
t merg
e
t
o
o
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
i
d Agui
l
ar
d
ifftool: Update copyr
i
ght notices to l
i
st each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
d
i
fftool: Use eval to expand
'
--extcmd' expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftoo
l
: Add '-x' a
n
d as
a
n al
i
as for '--ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-difftoo
l
.
sh: S
i
mplify the --extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-diff
.
txt: Link t
o
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool: Allow
s
pecifying unconfigur
e
d co
m
mands w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
diffto
o
l--helper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difftool--hel
p
er:
U
pd
a
te copyright and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
i
t-di
f
ftool
:
Add
'
-
-gui' for selecting a GUI
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
i
lar
t7800-difftool: Set a bogus tool f
o
r us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
he
l
p
: Do not unnecessarily
look f
o
r a reposi
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
id Aguilar
submodule
.
c: Squ
e
lch a "use befo
r
e assig
n
ment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
Agui
l
a
r
di
f
f
: generate pr
e
tty filenames
in
p
rep_
t
emp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agu
i
lar
c
o
mpat
:
add
a basename() compatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat: add a mkstemp
s
()
c
ompatibi
l
ity
fun
c
ti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
u
i
lar
Add git-r
e
pla
c
e to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Agui
l
a
r
me
r
geto
o
l--lib:
add support for araxi
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
mer
g
e
t
oo
l
--lib: specialize diff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l--lib: simplify
API usage b
y
rem
o
ving mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
difftool/merg
e
tool: refactor commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
m
e
r
getool: use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
ash co
m
pletion: add git
-
difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
d
ifftool: ad
d
suppo
r
t fo
r
a d
i
fftool
.
p
r
o
mpt conf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
di
f
f
t
ool: add various git
-
diff
t
oo
l
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: move 'git-dif
f
tool' out o
f
cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: add a -y shortcut for --no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
:
u
s
e
perl built-ins when
testing fo
r
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
o
l
: remov
e
the bac
k
up file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
ifftool:
r
em
o
ve
merge options
f
o
r
opendiff, tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid A
g
uilar
ev
e
r
y
day: us
e
the dashle
s
s form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Agu
i
lar
contrib/dif
f
tool: use a separ
a
te config na
m
es
p
ac
e
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
con
t
rib/difftoo
l
: Don't repeat
merge tool candi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
difftool:
p
ut the cursor on the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
:
f
i
x d
o
c
umentation pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguila
r
contrib: add
'
g
i
t
difftoo
l
'
for launching common m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Agu
i
lar
git-mer
g
etool
:
properly handle "git
me
r
getool -- filen
a
me"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Agu
i
la
r
tes
t
s
:
add a testca
s
e for "git sub
m
odule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid A
g
uilar
g
i
t-sub
m
odu
l
e:
a
dd "sync" com
m
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
git-submod
u
le:
replace dupl
i
c
ated code with
a
m
o
dule
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PA
T
CH] gi
t
k: D
o
n't show
local c
h
anges when
w
e there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree