repo.or.cz
/
alt-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 'rs/swap'
2017-02-08
Dav
i
d Aguilar
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 Ag
u
il
a
r
t
7
8
0
0:
simplif
y
basic us
a
ge
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguila
r
difftool:
fix b
u
g when prin
t
ing
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David
A
g
ui
l
a
r
gitk: Remove
t
rans
l
a
t
ed message
f
r
o
m comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Aguilar
m
ergetools: fi
x
xxdi
f
f
hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d Aguil
a
r
difftool: rename
v
ariables for
c
onsisten
c
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d A
g
uilar
difftool: ch
d
ir
a
s early a
s
possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Aguilar
difft
o
ol: sanitize
$workdir as
e
arly as
p
o
s
s
ible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
diffto
o
l: fix dir-diff index creation
w
hen in
a
subdirec
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
Aguilar
diff
t
o
o
l: fix di
r
-diff index cr
e
a
t
i
o
n wh
e
n i
n
a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetools/vimdiff: trust Vim
'
s exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergeto
o
l: honor
m
e
rget
o
ol
.
$tool
.
tru
s
tExitCode
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
i
d
A
guilar
mer
g
eto
o
l: h
o
nor
-
O
<
orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguila
r
mergetool: hon
o
r diff
.
o
r
de
r
File
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
ar
mergetoo
l
: move
m
ain p
r
ogram flow into a
main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguil
a
r
mergetoo
l
: add copyrig
h
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguil
a
r
d
ifftool: use Git::*
f
unctions instead o
f
pa
s
s
i
ng around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d A
g
ui
l
ar
di
f
fto
o
l:
a
void
$
GIT_DIR
a
nd
$
GIT_WORK
_
TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
ui
l
ar
subt
r
ee: adjust
f
unction
definitions
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subt
r
ee: adjust st
y
le
to match Codi
n
g
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree
:
fix "git
s
u
b
tr
e
e
split --rejo
i
n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Aguilar
t7900-subtre
e
.
sh: fix quotin
g
and brok
e
n
&&
c
hains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle unmerged files
i
n dir-diff
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Agui
l
ar
difftool
:
initialize va
r
iables for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avi
d
Aguilar
merg
e
tool: honor tempfile
configuration when resolvin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Agui
l
ar
mergetool: supp
o
rt delet
e
/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difft
o
ol: ig
n
o
r
e
symbo
l
ic links in u
s
e_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Da
v
id Aguil
a
r
contr
i
b/subtree: ignor
e
l
og
.
date configu
r
atio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
av
i
d A
g
uilar
mergetool
s
:
add
wi
n
m
e
rg
e
as a buil
t
i
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
eto
o
l--lib: set IFS for difftool an
d
merge
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetoo
l
s: stop setting $stat
u
s in
m
erg
e
_cmd(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
mer
g
etool: simplify c
o
n
dition
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid
Aguilar
di
f
ftool--
h
elper: ad
d
explicit exit state
m
ent
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
mergetool--lib:
remove use of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
Aguilar
difftool:
h
onor --trust-exit-code for bu
i
ltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
di
f
ftool: add support for --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
t7610-mer
g
etool: add tes
t
cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
ergeto
o
l:
add an o
p
t
ion for
w
riting to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: use more
co
n
serv
a
tive temporary f
i
l
ena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Aguilar
t
e
st-l
i
b-functions: ad
j
ust
style to
match CodingGu
i
d
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-merge
t
ool: use test_c
o
nf
i
g to is
o
l
a
te t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
rg
e
tools/m
e
ld: make usage of `--output` configura
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
l
a
r
git-sh-setu
p
: move GIT_DIR initialization
i
n
to a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
e
rgetool: use mo
r
e
c
onserva
t
iv
e
t
e
mporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t
e
st-lib-functions: a
d
j
u
st style t
o
match Codi
n
g
Gui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id A
g
uilar
t7610-merg
e
tool: p
r
efer
t
est_config over
git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-merg
e
tool: add missi
n
g
&&
a
nd
r
emov
e
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t7610-merget
o
ol:
u
se
t
abs instea
d
of
a
mix of t
a
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David A
g
u
i
lar
c
o
m
pleti
o
n: add
--show-signature for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
i
d
A
g
uila
r
stas
h
: p
r
efer --quiet ove
r
shell
r
e
d
irec
t
ion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
A
guilar
refs: make re
v
-parse --quiet
a
c
t
ua
l
ly qu
i
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
avid A
g
uilar
t1503: use test_must_be_e
m
p
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguilar
Docu
m
entation
:
a
n
ot
e
about stdout for git re
v
-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguilar
cl
e
anups: e
n
su
r
e that git-comp
a
t-ut
i
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Agu
i
lar
styl
e
fix: asterisks st
i
ck to th
e
va
r
iable, n
o
t the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
vid Aguilar
gitk: Catch mkdtemp error
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id A
g
uilar
gitk: Use mktemp -d to av
o
id predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TMPDIR when viewing ex
t
ernal dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Agui
l
a
r
difftool: support repos
i
tor
i
es with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Agu
i
l
ar
pull: add --ff-
o
nly to the hel
p
te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Agu
i
l
a
r
pull: add
pull
.
f
f
c
o
nfig
u
r
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
il
a
r
imap-send: e
l
iminate HMAC deprecatio
n
warnin
g
s on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminat
e
SHA-
1
deprecation warnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Ag
u
ilar
M
a
k
e
file: ad
d
support
f
or Apple
Commo
n
Crypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguilar
Makef
i
le: fix default
regex
settings on Dar
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
m
e
r
g
etools/kdiff3: do
n
ot u
s
e --auto when
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add a
comp
a
tibility comment to cmd_
v
ersion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
o
ntrib/mw-to-git/t/i
n
st
a
ll-
w
iki
.
sh:
use a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
Aguilar
contrib
/
examples
/
git-remote
.
perl: use a
l
owerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
a
r
tests:
u
se a
l
owercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git-svn: use a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
Documen
t
ation/user-manua
l
.
txt: use a lowerca
s
e
"
u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
tem
p
lates/ho
o
ks--updat
e
.
s
a
mple: use a lowercas
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
ontrib/hooks/s
e
t
g
itperms
.
p
erl:
u
se a
l
o
wercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
contrib
/
exa
m
ples:
use a
l
owe
r
case "us
a
ge:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
c
ontrib/fast-
i
mport/import-z
i
ps
.
py:
u
se spaces inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
c
ontr
i
b/
f
ast-import/
i
mport-zips
.
py
:
f
i
x
broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uil
a
r
con
t
rib/
f
ast-impo
r
t
:
use a lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/creden
t
i
al: use a lowercase
"us
a
ge:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
git-cvsimport: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
g
it-cvsimport: u
s
e
a lo
w
ercase "us
a
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
it-cvsex
p
ortco
m
mit
:
use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it
-
a
rchimport: use a
l
owercase
"
usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git
-
m
e
rg
e
-one-
f
i
le
:
use
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
g
it-relink
:
use a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
v
n: us
e
a lowe
r
ca
s
e "usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-sh-setup: u
s
e a lo
w
ercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Agu
i
la
r
t
7
800:
"defa
u
lts" is no longer a builti
n
tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
i
d
Aguilar
t78
0
0
: mod
e
rnize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
guila
r
t780
0
: updat
e
cop
y
r
ight no
t
ice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: silence unin
i
tialized variabl
e
warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguila
r
p
4merg
e
: fix prin
t
f u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
diff
t
ool--h
e
lper: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d
A
g
ui
l
ar
doc: ge
n
e
r
ate a list
of v
a
lid merge
to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
me
r
get
o
ol--
l
ib
:
add function
s
f
o
r fi
n
ding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool
-
-lib: improve
th
e
he
l
p text in gue
s
s_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
g
u
ilar
mergetool--l
i
b
:
simplify comman
d
expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simplify
how we handle "v
i
m
"
and "d
e
faults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
mergeto
o
l--lib: improve sho
w
_tool_help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id
A
gu
i
lar
mer
g
etools/vim: remove redu
n
da
n
t di
f
f command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next