repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
submodule.c: get_super_prefix_or_empty
2017-02-08
David
Ag
u
ilar
t7800: replace "wc -l" with t
e
st_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7800: simplify basic usag
e
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
Davi
d
A
g
uil
a
r
diff
t
ool: f
i
x b
u
g when print
i
n
g
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
g
i
t
k:
R
emov
e
tra
n
slated messag
e
fro
m
c
omments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Ag
u
ilar
mergeto
o
ls: fix
x
xdif
f
hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid
Aguilar
difftool:
r
ena
m
e variables for c
o
nsis
t
en
c
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguilar
difft
o
ol: chdi
r
as ea
r
ly as possi
b
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
difft
o
ol: sanitize $workdir as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
ilar
difft
o
ol: fix di
r
-
diff index creation
when in a
s
u
b
di
r
e
ctory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
diff
t
ool: fix dir-dif
f
i
ndex crea
t
i
on when
i
n a sub
d
irectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
avi
d
A
guilar
mergetools/vimdiff: trust
V
im's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetool: h
o
n
or mergetool
.
$tool
.
trus
t
ExitCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
guilar
merge
t
o
ol: honor -O<orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Aguilar
mergetool
:
h
o
nor dif
f
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
Aguilar
m
e
rgetool: move
ma
i
n
program flow
i
n
to a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: add copy
r
ight
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
difftool: use Git::
*
functions instead of passi
n
g around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
A
gui
l
ar
difftool: a
v
oid $GIT_DIR and
$G
I
T_WORK_TR
E
E
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id
A
guilar
subtree: adjust function def
i
ni
t
i
ons
t
o match CodingG
u
idelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Agui
l
ar
subtree:
adjust sty
l
e
to
match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vid A
g
uilar
subtree:
fi
x
"git subtree
split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Agui
l
ar
t7900-s
u
b
t
ree
.
sh: fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
d
i
fftool: hand
l
e unmerged files in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Ag
u
ilar
difftool: i
n
i
t
ializ
e
varia
b
l
es for rea
d
abilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
merg
e
t
o
o
l: honor tempfile
c
onfiguration when
resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
e
r
g
etool: support de
l
ete/delet
e
c
o
nflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
d
i
ffto
o
l: ignore symbolic links i
n
use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Da
v
i
d Aguil
a
r
contrib/sub
t
re
e
:
i
gn
o
re log
.
date config
u
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Aguilar
merg
e
t
ools: add winmerge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
ergetool--lib:
se
t
IFS f
o
r dif
f
t
o
ol and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
merget
o
o
l
s: st
o
p se
t
ti
n
g $status in merg
e
_cmd(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
e
rg
e
tool:
s
impli
f
y conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
d
i
fftool--helper: add explicit exi
t
statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
merget
o
o
l--lib:
r
em
o
ve use of
$
stat
u
s
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Davi
d
Aguila
r
di
f
ftool: honor --trust-exit
-
c
ode for builtin
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguil
a
r
difftool:
a
dd suppor
t
fo
r
-
-trust-ex
i
t-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7
6
10-
m
erge
t
ool:
a
dd
t
est case
s
f
o
r merget
o
ol
.
w
r
iteT
o
Temp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
mergetoo
l
: add an option for writing to a te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Agu
i
l
ar
mergetool: use mo
r
e conservat
i
v
e
t
emporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t
e
s
t-lib-funct
i
ons
:
adjust style to matc
h
CodingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uila
r
t7610-mergetool:
use te
s
t_config t
o
i
s
o
late t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
mergetools/meld: ma
k
e usage
of `--o
u
tput` co
n
figurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid
A
guil
a
r
g
i
t-sh-setup: move
GIT_DIR init
i
a
lization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
ilar
mergetool: use more cons
e
rvative te
m
p
o
rary f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functions: a
d
just
s
tyle to match C
o
dingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-
m
e
r
g
etool
:
pr
e
fer tes
t
_con
f
ig
over git confi
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
t761
0
-mergetool: add miss
i
ng && and remove
c
ommented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t7610-mergetool: u
s
e tabs
i
nstead o
f
a mix
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Davi
d
Aguilar
completion:
a
dd --
s
how
-
signature for log and sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash
:
prefer
-
-quiet o
v
e
r shell re
d
i
r
e
c
tion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
refs: ma
k
e rev-parse --quiet actuall
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agu
i
lar
t
1503: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Agui
l
ar
D
ocumentatio
n
: a note about stdout for
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
gui
l
ar
clean
u
ps: ensu
r
e that
g
it-compat-util
.
h
i
s
i
nclude
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Agui
l
ar
stylefix: asteris
k
s stick to the
variable,
n
o
t
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
A
guilar
g
itk: Catch mkdtemp e
r
rors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Ag
u
ilar
gitk: Use
m
k
te
m
p
-
d
to avoid predi
c
t
a
ble te
m
p
o
rar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Agui
l
ar
git
k
: Hon
o
r TM
P
DIR w
h
en vi
e
w
i
ng external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Ag
u
ilar
difftool: support repositories wit
h
.
git-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
A
gu
i
l
a
r
pul
l
:
add --ff
-
only t
o
the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguilar
pull: add pull
.
ff config
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid
Agu
i
lar
im
a
p
-sen
d
:
e
l
i
minate H
M
AC deprecation war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cac
h
e
.
h: elimin
a
te SHA-1 d
e
p
r
ecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
u
i
lar
Makefile: ad
d
support for
A
pple Commo
n
Cr
y
pto facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
Aguilar
Makefi
l
e
:
fix def
a
ult reg
e
x se
t
t
ings on
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
mergeto
o
ls/kdiff3:
do n
o
t use --
a
uto when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c
: add a compatibility comment to cm
d
_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-to-git/t
/
install-wiki
.
sh: use a
lower
c
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib
/
examples/
g
it-
r
emote
.
perl: use a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
t
est
s
: use a lo
w
ercase "usage:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
git-
s
vn: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/user
-
man
u
a
l
.
txt: use a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
temp
l
ates/hooks
-
-update
.
sa
m
ple: use a low
e
rca
s
e "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/hooks/setgitperms
.
perl: use a lowercase "
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
e
xamples: use a lo
w
erca
s
e "usag
e
:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
contrib/fa
s
t-import/impor
t
-zips
.
p
y: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
cont
r
ib/fas
t
-
import/import-zips
.
p
y: fix broken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
c
on
t
rib/fast-impo
r
t: use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
on
t
rib/c
r
ede
n
tial: use a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-cvsimport: u
s
e
a
l
ow
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
g
i
t-cvsimport: use a lo
w
ercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Ag
u
il
a
r
g
it-
c
vs
e
xportco
m
m
i
t: u
s
e
a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
a
r
git-arch
i
mport: use a
lowe
r
c
a
se "us
a
ge
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-fi
l
e: us
e
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
A
guilar
git-reli
n
k:
use
a
l
o
we
r
c
a
se "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-svn: use
a
lowe
r
c
a
se
"
usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-sh-set
u
p
:
u
s
e a lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguila
r
t7800: "defaults"
i
s no longer a builtin t
o
ol na
m
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modern
i
ze
t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t7800: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: sile
n
ce uninitiali
z
ed vari
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix
p
rint
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
diff
t
ool
-
-h
e
lper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
i
lar
doc: generate a li
s
t of v
a
li
d
merge t
o
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Agui
l
ar
m
ergetool--lib: add
f
unctions f
o
r finding a
v
ai
l
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
merg
e
tool--lib:
improve the help text in gue
s
s
_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool
-
-
lib:
simpl
i
fy com
m
a
n
d e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
s
: simplify how we handle "vim" and "d
e
faults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
m
e
rgetool--l
i
b: improve
s
ho
w
_
tool_help() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
merget
o
ols/vim: rem
o
ve r
e
dundant diff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next