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
test-lib-functions: adjust style to match CodingGuidelines
2014-10-16
David
Aguilar
t
e
st-lib-fu
n
c
t
ion
s
: ad
j
ust style to ma
t
c
h
Co
d
in
g
Guidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
g
uilar
t7610-mergetoo
l
:
u
s
e tes
t
_config to isolate tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
t7610-merg
e
tool: add
miss
i
ng &&
a
n
d remove
c
omment
e
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid A
g
uilar
t7610-mergetool:
u
se tabs instead
o
f a mix of
tab
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David A
g
uil
a
r
d
i
f
f
tool: sup
p
ort r
e
po
s
itories with
.
git-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David
Aguilar
pull
:
add --ff-only to the help tex
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
i
la
r
pull
:
add p
u
ll
.
ff configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguil
a
r
im
a
p-se
n
d: elim
i
nate HMAC deprecat
i
on warnings
on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
i
lar
cac
h
e
.
h:
e
liminate
S
H
A-1 depre
c
ation warn
i
ngs on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
Makefile: a
d
d support for Apple CommonC
r
yp
t
o facilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefi
l
e: fix default regex sett
i
ngs on
D
a
rwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mer
g
etool
s
/kdiff3:
do no
t
use
-
-auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
h
e
lp
.
c: ad
d
a compa
t
ibility co
m
m
e
nt to c
m
d_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
uilar
contrib/mw-to-git/t
/
i
nstall-wiki
.
sh: us
e
a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/examples/git-r
e
mote
.
perl
:
use
a
l
o
wercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
t
ests: use
a
lowercase "usage
:
" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
git-sv
n
: u
s
e a
l
owercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documen
t
ation/user-manual
.
tx
t
:
u
se a lo
w
e
r
case
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
la
r
t
e
mplates/hooks--
u
pdate
.
sample: use
a
lowercase "u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hook
s
/setg
i
tperms
.
pe
r
l
:
use a lowercase "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib
/
examp
l
es: use a lowercase "u
s
age:"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
c
o
n
t
rib/
f
ast-impor
t
/
import-zips
.
py:
use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
il
a
r
contrib/
f
ast-impo
r
t/import-zips
.
py: fix
b
r
oken
e
r
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
co
n
t
rib/
f
a
s
t
-
i
m
p
o
rt: u
s
e a lowercase "
u
sage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
con
t
rib/credent
i
a
l
:
use
a lowe
r
cas
e
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
impor
t
: use a lo
w
e
r
case "usage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
i
t-cvsimp
o
rt:
u
se
a
l
owercase
"
usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsexportc
o
mmit: use a lo
w
ercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
i
t-archimport: use a lower
c
ase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
git-merge-one-fi
l
e: use a low
e
rcase "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use
a lowe
r
case "us
a
ge:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn:
use
a
l
o
wercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
g
i
t-
s
h-setup: use
a
lowercase "usage:" s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "defaults" is no longer a builtin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
ar
t780
0
: m
o
d
ernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguilar
t7800: upda
t
e c
o
pyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Aguilar
difft
o
ol: sil
e
nc
e
uninit
i
a
lized v
a
riable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
rge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helper: fix printf us
a
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
doc: generate a li
s
t of val
i
d mer
g
e tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
g
u
i
lar
merge
t
oo
l
--l
i
b:
add functions for finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguil
a
r
mergetool--lib: improve t
h
e help
t
ext in g
u
es
s
_merge_to
o
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rg
e
tool--
l
ib: si
m
p
lify comman
d
expression
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetoo
l
s: simpli
f
y ho
w
we handle "vim"
a
nd "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
l
a
r
me
r
g
e
tool--li
b
: improve show
_
to
o
l_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
mer
g
e
tools/
v
im: remove redundant diff comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
mer
g
et
o
ols/p4merge: Honor $TMPDIR for the /dev/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
i
d Aguilar
mergetools/
p
4m
e
rge: Handle "/
d
ev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguila
r
mergetool--li
b
: Al
l
ow custom comma
n
ds t
o
o
v
e
rride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
g
i
tk: Rename 'tagco
n
te
n
ts' to 'c
a
c
hed_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
u
ilar
gitk: Teach
"
Reread
r
ef
e
renc
e
s" to re
l
oad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id
A
guilar
merg
e
t
o
ol,difftool: D
o
cu
m
ent --t
o
o
l
-
help consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gu
i
la
r
diffto
o
l: D
i
sable --symlinks
on cy
g
w
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool: Handle comp
a
re() r
e
t
urning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
difftool
:
Wrap long lines for read
a
b
i
l
it
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftool:
C
heck all re
t
urn codes fro
m
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Agu
i
lar
difftool
:
Han
d
le findi
n
g mergetools/ in a
path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: U
s
e symlinks when diffing agai
n
st the
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: C
a
ll
t
he t
e
mp director
y
"git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
l
a
r
d
i
f
f
tool: Move option valu
e
s into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol
:
Simplify p
r
int_tool_help(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Te
s
t difftool pa
s
si
n
g argu
m
ents
to d
i
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uilar
mer
g
etool: Provi
d
e an empty
file
w
hen needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
a
kefile: I
m
p
r
o
v
e compil
e
r header depe
n
dency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
m
er
g
e
t
ools/meld: Use '--o
u
tput'
w
hen available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool-
-
lib: Refa
c
tor tools in
t
o
s
e
parate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
mergetoo
l
--li
b
: Make
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
ui
l
ar
diff
t
o
ol-
-
helpe
r
: Make style consist
e
nt with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503-pre-commit-hook
.
sh: Add
GIT_
P
REFI
X
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Aguilar
gi
t
-
m
ergetool--lib: Ma
k
e vimd
i
ff retain the cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
il
a
r
git:
R
emove handling for GIT_PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
t
up: Provide G
I
T_PRE
F
I
X
to
b
uil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguilar
s
ubm
o
dule sync: Update "s
u
b
module
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid
A
guilar
mergetool: Skip
a
u
tor
e
solved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
ilar
Documentati
o
n: Explain git-merg
e
tool's use of
temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Mak
e
file:
R
e
move u
s
age of deprecated Pyth
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' whe
n
diff
.
guitool is unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
A
g
uilar
t7800-difftool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id
A
g
uilar
diffto
o
l: Updat
e
copyright notices to
l
ist each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool: Use eval to expan
d
'-
-
extcmd' exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftoo
l
: Add '
-
x' and as an al
i
a
s for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-difftool
.
sh
:
Simplif
y
the --
e
xtcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
x
t: Link to git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agui
l
ar
difftoo
l
:
Allow speci
f
ying unconf
i
gured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
i
fftool--helpe
r
:
Remov
e
use of the GIT_MERGE
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool--helpe
r
:
Update
c
o
pyrig
h
t an
d
remove
distrac
t
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Agui
l
ar
git-dif
f
to
o
l
:
Add '--gui
'
fo
r
sele
c
ting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t780
0
-difftool: Set a bogus tool for use by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
A
guilar
h
el
p
: Do not
u
n
n
e
c
essari
l
y look for
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Agui
l
ar
sub
m
od
u
le
.
c: Squel
c
h
a
"use
b
efore assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
i
lar
di
f
f: generate pretty
f
i
l
e
na
m
es in prep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
c
o
mpat: add
a
basename() compatibi
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
com
p
a
t
:
a
d
d
a
mk
s
temp
s
(
)
compa
t
ibility fu
n
ctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
lar
A
d
d git-replace to
.
gi
t
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David A
g
uil
a
r
mergetoo
l
--lib: add sup
p
ort for araxis m
e
r
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id
Ag
u
ila
r
merg
e
tool-
-
lib: spec
i
a
lize diff op
t
i
o
ns for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
mergeto
o
l--l
i
b: sim
p
lify API usage by re
m
oving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/m
e
r
g
etool: refactor commands t
o
us
e
git-merg
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
mergetool:
use
$
(
.
.
.
) instea
d
of `backti
c
k
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next