repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach merge the '[-e|--edit]' option
2011-10-12
Jay Sof
f
ian
Teach merge the '[-e|-
-
edit]' option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-09-20
Ja
y
S
offian
git-mergetoo
l
: c
h
eck retur
n
value from rea
d
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay Soffi
a
n
Add log
.
abbrevCommit config
v
aria
b
l
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-05-18
Jay Sof
f
ian
"g
i
t log -h": ty
p
ofix misspelled 'su
p
p
r
ess'
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay S
o
ffian
T
e
ac
h
commi
t
about CHERR
Y
_P
I
CK_HEA
D
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
J
ay Sof
f
i
an
bash: teach _
_
git_ps1 abo
u
t
C
H
ERRY_
P
I
CK_HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay Soffian
Introduce
C
H
ERRY_PI
C
K_HEAD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-22
Jay
Soffian
git-checkout
.
txt: impro
v
e detached HE
A
D document
a
tion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2011-02-15
Jay
S
of
f
i
an
merge: honor prepare-commit-msg
hook
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay S
o
ffian
git-ls-files
.
t
xt: clarify -x/--exclude option
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Jay Soff
i
an
fo
r
-eac
h
-ref: fi
x
obje
c
tname:shor
t
bug
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_
R
R is in
.
git, not
.
git/rr-c
a
c
h
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-20
J
a
y Soff
i
an
gitw
e
b/Makefil
e
: fix t
y
po i
n
gitweb
.
m
in
.
css
r
ule
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-16
Jay
S
offian
am
:
use ge
t
_aut
h
or
_
ide
n
t_from_co
m
mit instead of mai
l
info
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Jay Soffian
commit
.
txt: clarify how
-
-author argument is
used
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay So
f
f
ian
t5516-
f
etch-push
.
sh
:
style cl
e
anup
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
ay Soffian
receive-pack: detect aliase
d
updates
w
h
i
ch can
occur
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jay
S
o
f
fian
receive
-
pack: switch global variable 'co
m
mands'
to
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay Soff
i
an
Documentatio
n
/config
.
t
xt: defau
l
t
g
c
.
aggressiveWindow
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-02-09
J
a
y Soffian
bl
a
me: prev
e
nt a segv
w
hen -
L
g
iven star
t
> EOF
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
J
a
y Soffian
git-svn: allow su
b
set of branc
h
es/tags to be specifie
d
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
J
a
y
S
o
ffian
git-svn: allow UUID to be
m
an
u
ally
remapped via r
e
writeUUID
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
bui
l
tin-fetch
:
add --dry-r
u
n opti
o
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay So
f
f
i
an
b
u
iltin-fetch:
a
d
d -
-
prune
optio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Ja
y
Soffian
teach warn_dangling_sy
m
ref to take
a FILE
argume
n
t
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jay Soffian
remo
t
e: r
e
factor some lo
g
ic into
get_stale_heads()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay So
f
fian
send-em
a
il:
f
ix nasty bug in ask(
)
function
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send
-
email: ensu
r
e quoted addresses
a
re r
f
c20
4
7 enc
o
ded
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-02
J
ay Soffian
sen
d
-email: correct two tests
w
hich were going interactiv
e
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-ema
i
l: ask_default sh
o
uld
apply t
o
all e
m
ails
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: don't
attempt to
prompt if t
t
y is
c
losed
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay
So
f
fian
sen
d
-
e
m
ail: add tests f
o
r
r
efactored prompti
n
g
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-e
m
ail: r
e
f
a
c
tor and
en
s
ure prompting doesn't loop
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
J
a
y
S
offian
b
a
sh
c
o
m
pletion: teach fetch,
pull,
a
nd push to comple
t
e
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay
Soffi
a
n
bash completion:
r
e
factor --
s
trategy
c
ompletion
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-08
Jay So
f
fian
bash completion: fix complet
i
o
n issues
with
fetch,
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-03-03
Jay Soffian
send-em
a
il: add --confirm option and configu
r
at
i
on
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
builtin-remote:
n
ew show outpu
t
style f
o
r push refspecs
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
bui
l
tin-remote: new s
h
ow o
u
tput style
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay S
o
ffian
built
i
n-remote:
add
s
e
t-he
a
d subc
o
mmand
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-remote: teach
show
t
o dis
p
lay remote
H
E
AD
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay
S
of
f
ian
builtin-remote:
f
ix tw
o
i
nconsisten
c
ies in the output
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffia
n
b
u
i
ltin-remote: mak
e
get_r
e
mote_ref
_
states(
)
always
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
b
u
il
t
in-
r
emote: rename varia
b
les and e
l
iminate red
u
n
d
a
n
t
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffian
builtin-remote
:
re
m
ove unuse
d
code in g
e
t_re
f
_states
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
b
uiltin-remo
t
e
:
r
e
f
a
c
tor du
p
lic
a
ted cleanup code
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay So
f
fian
strin
g
-
list:
new f
o
r_
e
ach_string_l
i
st() fu
n
ctio
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay Soffi
a
n
remot
e
:
m
ake match_refs() not short-c
i
rc
u
it
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
ay Soffian
remote: make match_refs() copy src
r
ef before
a
ssigning
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay S
o
ffian
remote:
let guess_re
m
o
te_
h
ead() optionally re
t
urn all
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
Jay S
o
ffian
r
emote: make copy_ref() perform a deep
copy
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-27
J
a
y Soff
i
an
t
5540-http-push
.
sh: avoi
d
non
-
portable grep -P
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Soffian
remot
e
:
si
m
plify guess_remote_head()
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay So
f
fi
a
n
move locate_h
e
ad(
)
to re
m
ote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
J
a
y
Soffia
n
move
d
uplicated ref_newer()
t
o remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-26
Jay Sof
f
ian
move duplicated
g
et_local_heads() to remote
.
c
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-25
Jay Soffian
Allow
HTTP tests to run on Darw
i
n
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-24
J
a
y Soffian
s
e
nd-
e
mail: don't create temporary c
o
mpose
file until
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-18
Ja
y
Soffian
disallow providing mult
i
ple
u
pstream br
a
nches
to rebase
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
J
a
y Sof
f
ian
send-email: --suppress-cc
i
mprovem
e
nts
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soffia
n
s
e
nd-
e
m
ail: handle mul
t
iple Cc addresses wh
e
n reading
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-15
Jay Soff
i
an
s
e
nd-e
m
a
i
l
:
a
llow s
e
nd-em
a
il to run o
u
tside a repo
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-14
Jay Soffian
bui
l
tin-branc
h
: improve output when displaying remote
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-05
Jay Soffian
Makefile:
m
inor improve
m
e
n
t
s for Ma
c
OS X (Darwin)
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay Soffian
bui
l
t
i
n
-
remote: make rm operation
sa
f
er i
n
mirro
r
ed
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-02-04
Jay
S
o
f
fian
builtin
-
re
m
ot
e
: m
a
ke
rm()
use prope
r
l
y
n
amed variable
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
J
a
y
Soffian
git-am: min
o
r
c
l
eanups
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
J
a
y S
o
f
fian
Git
.
pm:
c
all Error::Simple() properly
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-27
J
ay Soff
i
an
send-email: fix In-Reply-To r
e
gression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Jay Soffi
a
n
rev-parse: fix
p
o
tential bus error with -
-
p
arse
o
p
t
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-23
Ja
y
S
o
ffi
a
n
pul
l
: pass --strateg
y
a
l
ong to to r
e
base
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-22
Jay Soffia
n
send-ema
i
l:
fi
x
In-Reply-To regression
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
send-email: squelch
war
n
ing due
to com
p
a
ring undefined
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Soffian
Co
r
rect gi
t
-pull
documentation
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
Jay Sof
f
ian
doc: documentati
o
n update
for the branch track c
h
ang
e
s
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-20
J
a
y
Soffian
branch: op
t
ionally se
t
up b
r
anch
.
*
.
merge from upstrea
m
.
.
.
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Jay Soffian
builtin-checkout
.
c: fix
possib
l
e usage se
g
fault
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
Jay Soffian
g
it-help--br
o
wse: improve br
o
wser support under OS
X
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-16
J
ay So
f
fian
mail
i
nfo:
feed on
l
y
o
n
e
line to handle_
f
ilter() for
.
.
.
The issue was noticed and fixed by
Jay Soffian
. JC added a test
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree
2008-02-12
Ja
y
Soffian
git-gui: s
u
pport Git Gui
.
ap
p
under OS X 10
.
5
Signed-off-by:
Jay Soffian
<jaysoffian@gmail.com>
commit
|
commitdiff
|
tree