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
test-parse-options: update to handle negative ints
2015-06-22
Charl
e
s
B
ailey
te
s
t-
p
arse-opt
i
ons: update to
handle negative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es
Bailey
diff
t
ool: don't
assume that def
a
ult sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
a
r
l
es
Bailey
m
er
g
e
t
ool:
don't r
e
q
u
ire a work tre
e
for
-
-
t
ool
-
he
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Cha
r
l
es Bailey
Fix contrib/subtree Makefile to patc
h
#! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bail
e
y
filter-branch:
eliminate duplic
a
te mapped p
a
rents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bswap
.
h:
d
etect
e
n
diann
e
ss on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
tests: don't r
e
l
y
on s
t
rerror text when te
s
ting
rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ailey
dir
.
c:
m
ake
git_
f
n
match(
)
not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bai
l
ey
m
e
rg
e
t
ool: Remov
e
e
xplicit references
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
s
t
ash
tests: stash
can lose
d
a
t
a
in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash:
Don'
t
ov
e
rwrite files tha
t
hav
e
gone
from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arles Bailey
Documentat
i
on: Describe other situations
wher
e
-z affect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to generat
e
output even fo
r
null merg
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t602
3
: merge-f
i
le fai
l
s t
o
outp
u
t
a
nything fo
r
a
d
egenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
mergetoo
l
: fix ru
n
n
ing merg
e
tool in sub-dir
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les Bailey
mergetool: Add a test f
o
r run
n
in
g
m
e
rgetool in a
s
ub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ail
e
y
merge
t
ool: respect
a
utocrlf by using chec
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
erget
o
ol: Do
n
't
keep
te
m
porary mer
g
e fil
e
s
unle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
ley
me
r
getool: Add pr
o
m
pt to
c
ontinu
e
afte
r
fai
l
i
n
g t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
d
d
-y/--no
-
prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
ley
Fix some
t
ab/
s
pace incon
s
ist
e
n
c
ies in git-mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charle
s
Ba
i
ley
git-archive: work in bar
e
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
Make git ar
c
hive respect cor
e
.
au
t
ocrlf whe
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
il
e
y
Add ne
w
test to dem
o
nstra
t
e git
ar
c
hive
core
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
le
y
merge-
t
o
ol do
c
um
e
ntation: descri
b
e
c
ustom
c
om
m
an
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
g
i
t
-merg
e
tool docum
e
ntaiton:
s
h
o
w toolnames in
t
ypewr
i
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bail
e
y
A
d
d a ve
r
y basic
t
est script f
o
r git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Te
a
c
h
g
it mer
g
e
t
ool to use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
B
ailey
Changed a
n
inte
r
nal v
a
ria
b
le of merg
e
tool to sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy u
p
git mergetool's backup file behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Ba
i
l
ey
gitk: Fix the Makefile to
c
o
p
e with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s
Bailey
Remove ol
d
generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Ba
i
ley
F
ix git-instaweb
breakage on MacOS X
due to the li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix c
l
o
ne
not to ignore dept
h
when performing a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree