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
stash: introduce push verb
2016-12-12
D
a
vid Aguil
a
r
mergetools: fix xxd
i
ff
hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftoo
l
: rename variables
f
o
r
consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d
Ag
u
ila
r
diffto
o
l: chdir as early as p
o
ss
i
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Aguilar
d
ifftool: sanitize
$
workd
i
r
as ear
l
y as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool:
f
ix
dir-d
i
ff index creation wh
e
n in a subdi
r
ectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
av
i
d
A
guilar
difftool: fix dir-diff i
n
d
e
x creation
w
hen in a su
b
d
ir
e
ctory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Ag
u
ilar
merget
o
ols/vimdiff: trust Vim's exi
t
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
Aguilar
mergetool: h
o
nor mer
g
etool
.
$
tool
.
t
r
u
stE
x
itCode f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
me
r
getool: honor -
O
<
orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Ag
u
ila
r
merget
o
ol:
honor dif
f
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
a
r
me
r
getool: m
o
ve main pro
g
ram flow into a main
(
) function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Aguilar
mergeto
o
l
:
add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
A
g
u
i
lar
difftool: use Git::* functions ins
t
ead o
f
p
a
ssing aroun
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid A
g
uilar
dif
f
tool:
avoid $
G
I
T_D
I
R
a
nd $GIT_WOR
K
_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subt
r
ee: adju
s
t
function defin
i
tions to matc
h
CodingGuide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
u
i
la
r
subtree: a
d
just style to match C
o
d
i
n
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id Aguilar
s
u
btree
:
fix "git subtree s
p
lit --
r
ejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
A
guilar
t
7900-subtree
.
sh: fi
x
q
u
oting an
d
broken
&
& cha
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: h
a
n
d
l
e unmerge
d
files
i
n dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
i
d A
g
uilar
difftoo
l
: initialize
v
ariables for
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
e
rg
e
tool: h
o
nor tempfile configuration when
r
e
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetoo
l
: supp
o
rt delete/delete co
n
flict
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguila
r
difftool: ignore s
y
mbolic links in use_wt_fil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
A
guilar
contrib/
s
ubtree: ig
n
ore log
.
date configurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vid Aguilar
mergetools:
a
d
d winmerge
as
a b
u
iltin
t
o
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
lar
mergetool-
-
lib
:
set IFS for difftool and merg
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetools: st
o
p setting $s
t
atus in merge
_
cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguil
a
r
mergetool: simplify condi
t
i
o
nals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--hel
p
er: add ex
p
licit exit
s
tatement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
mergetool--l
i
b: re
m
ove
u
se of $s
t
atus globa
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
diff
t
ool: honor
--trust-
e
x
i
t-code f
o
r
bu
i
ltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool: add
support for
-
-
t
r
ust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mer
g
etool
:
add te
s
t ca
s
es f
o
r mergetool
.
w
ri
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
u
i
lar
mergetool: add an option for wr
i
tin
g
to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
u
i
lar
mer
g
e
to
o
l: use more c
o
nservative
te
m
porary fil
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d Aguilar
test-lib
-
funct
i
ons: adjust s
t
yle to match Coding
G
u
i
d
el
i
ne
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t
7
610-merget
o
ol: use test_confi
g
to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guil
a
r
mergetools/meld: make usage of `--ou
t
p
u
t` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
git-s
h
-s
e
t
u
p: m
o
ve GIT_
D
IR initializat
i
on into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguila
r
me
r
g
etool: use mor
e
c
ons
e
rv
a
tiv
e
temporary
f
ile
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
t
est
-
lib-
f
u
ncti
o
ns: adjust
s
tyle
to
m
atch CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid A
g
uilar
t7610-mergetool: prefer
test_confi
g
o
ver git confi
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Ag
u
i
lar
t
7610-me
r
get
o
ol: a
d
d mis
s
i
ng &
&
and
r
emove comme
n
t
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t761
0
-me
r
getool: use t
a
bs ins
t
ead of a mix of ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
avid Aguilar
completion: add --
s
how-sig
n
ature for log and
s
how
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avi
d
A
g
ui
l
ar
stash: prefer -
-
quie
t
ov
e
r shell redirection of
t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs:
make
rev-
p
arse --quiet actually q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
A
guil
a
r
t1503: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
uil
a
r
Documentation: a note abo
u
t stdout f
o
r git rev-pars
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguilar
cleanups:
ensure that
g
it-
c
ompat-
u
t
il
.
h is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
s
t
y
l
efix: asterisks stick
t
o the variable,
not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
Aguilar
gitk: Catch mkdtemp
e
r
r
ors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk:
U
se mktemp -
d
t
o
avoid predict
a
ble temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
ilar
gitk: Ho
n
o
r TMPDIR when vi
e
wing ext
e
rna
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Dav
i
d Aguilar
difftool: support reposito
r
ies with
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguila
r
pul
l
: add
-
-
ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
ar
pull:
a
dd pull
.
ff
c
onfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap
-
send:
e
limina
t
e HMAC deprecat
i
on warni
n
gs on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
c
a
che
.
h: elimin
a
t
e SHA-1
d
ep
r
e
c
ation war
n
ings
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
M
akefi
l
e: ad
d
support
f
o
r
Apple CommonCrypto faci
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid A
g
uila
r
Make
f
ile:
f
ix default re
g
ex setting
s
on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguila
r
mergetoo
l
s/kdif
f
3: do
not use
-
-
auto
w
h
e
n di
f
f
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Aguilar
help
.
c: add a compat
i
bili
t
y
c
omm
e
nt to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
co
n
trib/mw-
t
o-git/t/install-w
i
ki
.
s
h: use a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
Aguilar
contrib/exampl
e
s/g
i
t-re
m
ote
.
p
erl: u
s
e a
l
o
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
tests: use a lowercase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguil
a
r
git-svn: u
s
e a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
Do
c
u
menta
t
i
o
n/user-manual
.
t
x
t
: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
templ
a
tes/h
o
oks--upd
a
t
e
.
samp
l
e: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Ag
u
ilar
c
o
ntrib/hook
s
/
setgitperm
s
.
pe
r
l: use a lowerc
a
se
"
u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
nt
r
ib/example
s
: use a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
tri
b
/fast-import/import-zip
s
.
py: use spaces
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/i
m
p
o
rt-zips
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impor
t
:
use a l
o
wercase "
u
s
age:" s
t
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
cont
r
ib
/
c
r
ede
n
tial:
u
s
e
a l
o
wercase "usag
e
:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsimport: use a lowercase "us
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
gi
t
-cvsimport: use a lowercase "usage
:
" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsexp
o
r
t
comm
i
t:
use
a lowercase "
u
sage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
git-archimport: use a
l
owercase "usa
g
e:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
lar
git-merge-one-file: use a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
reli
n
k: use
a
l
o
wercase "us
a
ge:"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-
s
vn:
use a lowercase
"
usag
e
:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
g
it-sh-setup: use
a
lo
w
e
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defa
u
lts" is
no
l
o
n
ger a builtin
to
o
l name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t78
0
0
:
mod
e
rnize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t780
0
: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David
A
g
u
ila
r
difftoo
l
: silence u
n
initial
i
zed variable wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
gu
i
lar
p
4
mer
g
e: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--he
l
pe
r
: f
i
x
pr
i
ntf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
i
d
Aguilar
doc
:
generate a list of valid merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
mergetool--lib: add
functions
for
f
i
nding
a
vai
l
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
getool--lib: improv
e
the help
text in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id Aguilar
mergetoo
l
--l
i
b: simp
l
i
f
y
c
o
m
mand expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
A
guilar
mergetools
:
s
implif
y
how we handle "v
i
m" and "
d
efaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetool--lib: improve show_too
l
_h
e
lp(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agu
i
lar
m
e
rgeto
o
ls/vim: remove r
e
d
u
ndan
t
diff comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p
4
merge: Honor $TMP
D
IR fo
r
the /d
e
v/
n
ull
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Ag
u
i
l
ar
m
e
rgetools/p4mer
g
e: Handle "/d
e
v
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
ergetool--lib: Allow
custom commands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Ren
a
me 'tagcontent
s
'
t
o 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next