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
builtin-am: implement committing applied patch
2015-07-17
Charles B
a
i
l
ey
u
n
tracked: fix detect
i
on of uname(2) failu
r
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charles Bailey
Fix de
f
inition of A
R
RAY_SIZE
for n
o
n-g
c
c bui
l
ds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles
B
ailey
contrib/
s
ubtree: small tidy
-
u
p
to t
e
st
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
contrib/subtree: fix broken &&-chains a
n
d revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
c
o
ntrib/su
b
tree
:
use tabs
co
n
sitently for indentation
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles Bailey
p
a
rse-options: move
u
nsigned long
o
ption parsing ou
t
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles B
a
iley
test-parse-options: update to handle negative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
e
s Bailey
d
iffto
o
l:
don't assume tha
t
d
e
fault sh is
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
mergetool:
d
on't re
q
ui
r
e a
w
or
k
tree
f
or
-
-tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles Baile
y
Fix co
n
trib/subtree Makefile to patch
#
!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filter
-
bran
c
h: e
l
iminate duplicate map
p
e
d pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
harles Baile
y
compat/bswap
.
h:
d
e
t
ect endia
n
ness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
ha
r
les Bailey
t
e
sts
:
don't rely on
s
trerror text
wh
e
n
testing
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles
B
ailey
dir
.
c: make g
i
t
_
f
n
matc
h
() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
ha
r
les B
a
iley
m
ergetool: Remove explicit referen
c
es to /dev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
le
y
s
t
ash tests: stash can
lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harle
s
B
a
iley
s
tash: Don
'
t ov
e
rw
r
ite files
th
a
t
h
ave go
n
e from t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
Docu
m
entation:
Describe other situa
t
ions where -z affe
c
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bai
l
e
y
C
h
a
n
ge xdl
_
me
r
ge to generat
e
o
utput even for null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harle
s
Bai
l
ey
t
6023: merg
e
-file f
a
i
l
s to o
u
tput anyth
i
n
g
f
or a degenera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Baile
y
m
e
r
g
et
o
ol: fix running mergetool in
sub-d
i
r
e
c
to
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
mergeto
o
l: Ad
d
a test for running mergetool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les
B
a
i
ley
mer
g
etool: respe
c
t autoc
r
lf
b
y using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
merg
e
tool: Don
'
t ke
e
p te
m
porary merge files
u
n
l
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
mergetool:
Add
p
rompt to continue after failin
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Add -y/--
n
o-prompt
option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
Fix
some tab/space inconsistencies
i
n
g
it-
m
ergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charle
s
B
ail
e
y
g
it
-
a
rchive
:
w
ork in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
Ma
k
e
git arch
i
v
e
re
s
pect cor
e
.
autocrlf
when cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rl
e
s
B
ailey
Ad
d
new test to demons
t
rate gi
t
arch
i
ve cor
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
a
i
l
ey
merg
e
-tool documentati
o
n: d
e
scribe custom comman
d
usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles
B
ailey
git-mer
g
e
tool doc
u
mentaiton: show
t
o
o
lnames in t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Ba
i
ley
Ad
d
a very basic test script for
gi
t
merg
e
to
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bai
l
ey
Teach git m
e
rgetool to u
s
e
c
ustom comma
n
ds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
hanged a
n
inte
r
nal variable of mergetool to
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Tid
y
up gi
t
me
r
getool's backup file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
les
B
ailey
gitk: Fix the Make
f
i
l
e
t
o
c
o
pe with systems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Re
m
ove o
l
d generat
e
d file
s
fro
m
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-instaweb breakage on
M
acOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not
t
o ignore depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree