repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/merge-tree-added-identically'
2013-05-07
Ju
n
io C Hamano
M
e
rge
b
ranch 'jk/me
r
g
e-tree-adde
d
-identically'
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
merge-tree: hand
l
e director
y
/empty
confl
i
ct
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
M
e
r
ge branch '
f
c/remote-b
z
r'
commit
|
commitdiff
|
tree
2013-05-07
Felipe Contreras
remot
e
-b
z
r:
a
void b
a
d refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Felipe Contreras
r
emote-bzr
:
c
o
n
v
ert a
l
l un
i
code
ke
y
s to str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
J
unio C
Hamano
M
e
rge branch 'fc/pu
s
h-with-export
-
reporting-re
s
ult'
commit
|
commitdiff
|
tree
2013-05-05
F
e
lipe Co
n
t
r
eras
tran
s
port-helper: impr
o
ve pus
h
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Juni
o
C
Hamano
Git 1
.
8
.
3-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Merge bra
n
ch 'tr/unpack-ent
r
y-use-after-free-fix
'
commit
|
commitdiff
|
tree
2013-05-03
J
u
ni
o
C Hamano
S
y
nc with maint
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o C Haman
o
Merge branch 'tr/remote-tight
e
n-commandline-parsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio C Ha
m
ano
Merge branch 'jn/glossary-revis
i
on' into maint
commit
|
commitdiff
|
tree
2013-05-03
Felipe Contr
e
r
as
complet
i
on: zsh: don't over
r
ide suffix
on
_
detaul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Anders Granskogen
.
.
.
Documentation/
g
it-commit:
T
yp
o
under --edit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Update draft release note
s
to
1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Ma
r
c Branchaud
Fi
x
grammar in the 1
.
8
.
3 re
l
ease notes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merg
e
b
r
anch 'hb/git-pm
-
tempfile'
commit
|
commitdiff
|
tree
2013-05-01
Junio C
H
a
mano
M
erge branch
'
r
s/pp-user-info-withou
t
-
extra-allocation'
commit
|
commitdiff
|
tree
2013-05-01
J
u
n
i
o
C
Hamano
Merge
b
ranch 'tr/remote-tighten-commandline-parsing'
commit
|
commitdiff
|
tree
2013-05-01
Jun
i
o C Hamano
M
e
rge branch 'zk/pr
o
mpt-rebase-step'
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Con
t
reras
r
e
mote-bzr: acce
s
s bran
c
he
s
on
l
y when needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contreras
r
e
mote-bzr: delay pee
r
br
a
nch
u
sa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
e
mote-bzr: iterate rev
i
sions
p
r
o
perly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Cont
r
eras
remote-
b
zr: im
p
rove progress repo
r
ti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Co
n
treras
remote-bzr: a
d
d
optio
n
to
s
pecify branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
p
e
Contre
r
as
remote
-
b
z
r
:
a
d
d custom method to find branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remot
e
-
b
z
r:
i
mprove author san
i
tazion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elip
e
Contr
e
ras
remote-bz
r
: a
d
d support for
shared repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
el
i
pe Contreras
remote-bzr: fix branch names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contre
r
a
s
re
m
ote-bzr: add support for
b
z
r
repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Contre
r
as
r
e
mote-bz
r
:
us
e
branch
v
ar
i
a
b
l
e when appro
p
riate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
rer
a
s
remote-bzr:
f
ix partially pu
s
h
e
d
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contr
e
ras
remote-bzr: fixes
for branch dive
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrer
a
s
rem
o
t
e
-bzr: add
support to push merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remo
t
e-bzr: alway
s
try to update the worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: fix order
o
f lo
c
king
in CustomT
r
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: delay bl
o
b fetching unt
i
l
the
very end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
l
i
pe Contreras
remo
t
e-bzr: cleanup CustomTree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-30
T
h
omas Rast
unpack_entr
y
: avoid f
r
e
e
ing objects in base c
a
che
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandr
a
git-com
p
letion
.
bash: add r
e
mote
.
pushdefault to config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-completion
.
bash: add bra
n
ch
.
*
.
pushremote to con
f
ig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Jun
i
o C Hamano
M
e
r
g
e b
r
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2013-04-29
Junio C Ham
a
no
Merge branch 'fc/zsh-
c
ompletion' into mai
n
t
commit
|
commitdiff
|
tree
2013-04-29
Fe
l
ipe Contreras
complete: zsh: use zsh completi
o
n for the main
c
m
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contreras
c
o
mplete
:
z
s
h: tr
i
vial simpli
f
ication
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandr
a
git-completion
.
bash: complete bran
c
h
.
*
.
rebase a
s
boo
l
ean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ra
m
achandra
git-co
m
pletion
.
bash: ad
d
diff
.
submodu
l
e
to config
l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramach
a
n
d
r
a
git-com
p
l
etio
n
.
ba
s
h: lexical sorting for diff
.
statGraphWid
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merijn Br
a
nd
Git
.
pm: call tempfile from File::Temp as a reg
u
lar
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Mer
g
e bran
c
h
'maint'
commit
|
commitdiff
|
tree
2013-04-28
Felipe Contreras
documentation: trivial whitespa
c
e cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t/Makefile: remove smok
e
test targets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
J
unio C
H
ama
n
o
Merge branc
h
'nd/pretty-formats'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
pretty: F
i
x
bug in
t
r
u
n
c
ation supp
o
rt for %>, %< and
%
><
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Ham
a
no
Me
r
ge b
r
an
c
h '
j
k/
c
heck-corrupt-
o
bjects-ca
r
ef
u
ll
y
'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
clone: Make the
'j
u
nk_mode' sym
b
o
l a fil
e
sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Ju
n
io
C Ha
m
a
n
o
Merg
e
branch 'j
k
/
merge-tree-add
e
d
-
identically'
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
m
erge-tree: fix typ
o
in
"both changed identically"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-27
Felipe Contrera
s
completion: ad
d
missing format-patch
o
p
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
J
unio
C Ha
m
ano
Git 1
.
8
.
3-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
J
unio C Hamano
Merge
b
ranch 'rr/shortlog-doc'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge
branch 'th/bisect-sk
i
pped-log
'
commit
|
commitdiff
|
tree
2013-04-26
Junio C
Hamano
Merge
b
r
a
nch 'ph/
r
eba
s
e-original'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Me
r
ge
branch 'jn/glossar
y
-
r
evision'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge branc
h
'
j
c
/add-ignore-remo
v
a
l
'
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contreras
remote-bzr: strip ex
t
ra newline
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Fe
l
ipe Contre
r
as
remote-bzr: tell bazaar to be q
u
i
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Felipe
C
ontr
e
r
as
remote-bzr: store
converted URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
F
elipe C
o
ntreras
remot
e
-hg: use hashlib ins
t
ead of
hg s
h
a1 ut
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Fel
i
pe Contreras
rem
o
te-bzr: add s
u
pport to push URL
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contreras
r
e
mote
-
bzr: fix bad state iss
u
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
F
elipe Contre
r
as
re
m
ote-hg: remove
e
xtra c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
F
e
lipe
C
ontreras
remote-helpe
r
s: trivial cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
J
u
nio C Ham
a
n
o
Me
r
ge branch 'fc/remote-
h
g
'
commit
|
commitdiff
|
tree
2013-04-26
Junio
C Hamano
Mer
g
e branch 'fc/remote
-
b
z
r
'
commit
|
commitdiff
|
tree
2013-04-26
Junio C
Hamano
Merge
branch 'jc/warn-pathless
-
a
d
d-
f
inishing-touches'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ham
a
no
git
add
:
avoid "-u
/
-A wi
t
hout
p
athspec" w
a
r
n
i
ng on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
H
amano
Sync w
i
th 1
.
8
.
2
.
2
commit
|
commitdiff
|
tree
2013-04-26
Junio C
H
amano
Git 1
.
8
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ham
a
no
Merg
e
branch 'jk/a-thread-only-di
e
s-once' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Me
r
g
e branc
h
'jn/g
i
twe
b
-i
n
stall-doc' into m
a
int
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
Hamano
Me
r
g
e
b
ranc
h
'fc
/
untracked-zsh
-
p
r
ompt' int
o
m
a
int
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o
C Hamano
M
erge bran
c
h 'jk/receive-pack-deadlocks-with-ear
l
y
.
.
.
commit
|
commitdiff
|
tree
2013-04-26
J
unio C
Hamano
Mer
g
e branch
'jk/chopped-ident' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ha
m
ano
Mer
g
e b
r
a
nch '
r
t/commentch
a
r-fmt-merge-ms
g
' into main
t
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
Hamano
Merge
branch 'rs/empty
-
archi
v
e'
into maint
commit
|
commitdiff
|
tree
2013-04-26
J
unio
C
Ha
m
ano
Merge
b
ranch
'pe/pull-reba
s
e-v-q' into maint
commit
|
commitdiff
|
tree
2013-04-26
T
orste
n
B
ö
gers
h
ausen
t7409: do not us
e
export X=Y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Tors
t
en Bögershausen
test
-
hg
-
hg-git
.
sh: do not use export X
=
Y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Torsten B
ö
g
e
rshausen
t
est-hg-bi
d
i
.
sh: do no
t
use export X=Y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Torsten
B
ögershausen
t9501:
do
n
ot use
e
xport X
=
Y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-26
Torst
e
n Bögers
h
ausen
t9020
:
do not use
e
xport X=Y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-25
Felipe Contr
e
ras
r
e
m
ot
e
-bzr
:
u
se proper pu
s
h
method
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-25
Re
n
é Scha
r
f
e
pretty: r
e
move intermediate
s
trbu
f
s
f
rom pp_us
e
r
_
info()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-25
Re
n
é
Scharfe
pretty: simplify o
u
t
put line leng
t
h
c
alculation in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-25
René S
c
harfe
pretty: simplify
i
nput line l
e
ng
t
h calculation in p
p
_user_info()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-25
Z
o
ltan Klinger
ba
s
h-p
r
ompt
.
sh: show where rebase is at when sto
p
p
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-24
J
u
nio C H
a
m
ano
M
e
rge
b
r
a
nch 'jk/remote-helper-with-
s
i
gned-t
a
gs'
commit
|
commitdiff
|
tree
2013-04-24
J
unio C
Hamano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2013-04-24
Junio C Hamano
U
p
date draft release notes
to 1
.
8
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next