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
Merge branch 'jk/merge-tree-added-identically'
2013-05-07
J
u
nio C Hamano
Merge branch 'jk/m
e
rge-tree-added-
i
dentically'
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n Keeping
merg
e
-tree
:
handle dir
e
ctory/empty conflict correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hama
n
o
Merge bra
n
c
h
'fc
/
remot
e
-bzr'
commit
|
commitdiff
|
tree
2013-05-07
Felipe Contrer
a
s
r
e
mote-bzr:
a
void bad
r
e
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-06
Felipe Contreras
re
m
ote-b
z
r
:
convert all un
i
code
keys
t
o str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-05
J
unio C H
a
mano
M
erge br
a
nch 'fc/push-with-exp
o
rt-rep
o
rting-r
e
sult'
commit
|
commitdiff
|
tree
2013-05-05
Fe
l
ipe Contr
e
ras
transport-helpe
r
: im
p
ro
v
e
push messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
G
i
t 1
.
8
.
3-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o C Ham
a
no
Merge branch 'tr/
u
npack-ent
r
y-use-after-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Sync with
m
aint
commit
|
commitdiff
|
tree
2013-05-03
Junio
C
H
amano
Merge
branch 'tr/r
e
mote-tight
e
n-c
o
mmandline-
p
arsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio C Haman
o
Merge branch 'jn/g
l
ossary
-
revision' into maint
commit
|
commitdiff
|
tree
2013-05-03
F
elipe
Contrera
s
com
p
letion: zsh: don't over
r
i
de su
f
f
i
x
o
n
_de
t
ault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
A
nders
G
ranskogen
.
.
.
D
o
cumenta
t
ion/git-commi
t
: Typo
u
nd
e
r
--edit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio
C
Hamano
Update draft r
e
lea
s
e notes to
1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
a
rc
B
r
anchaud
Fix grammar in the 1
.
8
.
3
r
e
l
e
ase notes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
J
u
n
io C Hamano
M
e
rge branch 'hb/git-p
m
-
t
empfi
l
e
'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge branch 'r
s
/pp-user-info-withou
t
-extra-a
l
loca
t
i
o
n
'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
M
e
rge branch 'tr/remote-ti
g
hten
-
c
omm
a
ndline-parsing'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ha
m
a
n
o
Merge branch 'zk/prompt-r
e
base-step'
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ontrer
a
s
remote-bzr: access branches o
n
l
y
when n
e
ede
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
p
e Contreras
remote-bzr: d
e
lay
p
eer branch usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
p
e Contreras
remote-bzr:
i
terate
revisions properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Con
t
reras
remote-
b
zr
:
improve
progress reporting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lip
e
C
o
ntreras
remote-bz
r
:
a
dd opti
o
n to specify
branc
h
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Co
n
treras
re
m
ote-bzr: add custom method to find bra
n
ches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-b
z
r:
impr
o
ve author
san
i
tazion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe
C
ontreras
remote-
b
zr: add support
f
or shared re
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
o
n
t
reras
r
e
mote-b
z
r: fix branch names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
p
e
Contreras
rem
o
te-bzr: add support for bzr repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe
Contreras
remo
t
e
-
bzr
:
use br
a
n
c
h variab
l
e whe
n
ap
p
r
opriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Co
n
t
r
er
a
s
remote-bzr: fix pa
r
tia
l
l
y
p
ushed merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
e
mote-
b
z
r
:
f
i
x
es for branch diverge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
n
trera
s
remote-
b
zr
:
add support to push merge
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
rem
o
te-bzr: a
l
ways try to
update
the worktree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe Contreras
remote-bzr: fi
x
order of locking
in CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Co
n
treras
re
m
ote
-
bzr: d
e
l
a
y blo
b
fe
t
c
h
i
ng u
n
til the very en
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
p
e
Cont
r
eras
remo
t
e
-bzr
:
c
leanup CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
T
homas R
a
st
unpack_entry: avoid fre
e
ing obje
c
ts i
n
base cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ram
k
umar Ramachand
r
a
git-completion
.
bash: add remo
t
e
.
pushdefault
t
o co
n
fig
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
R
amk
u
mar
R
amachand
r
a
g
it-c
o
m
plet
i
on
.
bash: add branch
.
*
.
pu
s
h
r
e
mot
e
t
o co
n
fi
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ju
n
io C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2013-04-29
J
unio C Ha
m
an
o
Mer
g
e b
r
anch 'fc/zsh-completion' into maint
commit
|
commitdiff
|
tree
2013-04-29
Felipe Con
t
re
r
as
complete: zsh
:
use zsh completion for
t
he main
cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
F
e
lipe C
o
ntreras
complete: zsh:
trivial
simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Rama
c
handra
git-c
o
m
p
l
e
tion
.
b
ash:
complete
bra
n
ch
.
*
.
rebase
a
s
boolean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar
Ramachandr
a
g
i
t-completion
.
bash
:
add diff
.
su
b
m
odule to conf
i
g
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar R
a
m
a
chandr
a
gi
t
-compl
e
tion
.
bash: lexic
a
l sorting for
diff
.
sta
t
GraphWi
d
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merijn Br
a
nd
G
i
t
.
pm: c
a
ll
t
emp
f
ile from File::
T
emp as a regular
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C H
a
ma
n
o
M
erge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2013-04-28
Felip
e
Contr
e
ras
documentatio
n
:
triv
i
al whites
p
ace clea
n
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Make
f
ile: r
e
move sm
o
ke t
e
st target
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Mer
g
e
branch
'
n
d
/p
r
et
t
y
-formats'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
prett
y
: Fix bug in
t
runc
a
tion suppor
t
f
or
%
>
, %<
a
nd
%
><
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Merge b
r
anc
h
'j
k
/
c
heck-
c
o
rrupt-objects-caref
u
lly'
commit
|
commitdiff
|
tree
2013-04-28
Ram
s
ay Jone
s
clone:
Mak
e
the 'j
u
nk_mode' sym
b
ol a file s
t
atic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio
C
Hama
n
o
Merge
b
ranch 'jk/m
e
rge-tree-added-identically'
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
merge-tree: fix
typo in "both changed identica
l
ly"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-27
Fe
l
ipe Contr
e
r
a
s
c
ompleti
o
n: add
missing format-patch options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Git 1
.
8
.
3-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
H
ama
n
o
Merge branch 'rr/sh
o
r
t
lo
g
-d
o
c'
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o C Hamano
Mer
g
e
branc
h
'th/bise
c
t-ski
p
ped-
l
og'
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
H
a
mano
Merge
b
r
anch '
p
h/rebase-original'
commit
|
commitdiff
|
tree
2013-04-26
J
u
n
io C Hamano
Mer
g
e branch 'jn/glossary-revision'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Mer
g
e branch 'jc/add-ignore-removal
'
commit
|
commitdiff
|
tree
2013-04-26
Felipe Co
n
t
reras
remote-bzr: str
i
p extra newline
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Co
n
treras
remote-bz
r
: te
l
l bazaar to be quie
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
F
eli
p
e Contreras
r
emote-bzr:
s
to
r
e co
n
v
e
r
ted URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Feli
p
e Cont
r
eras
r
e
m
o
te-hg: use hashlib in
s
tea
d
of hg sha
1
uti
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe
Contreras
r
emote-bzr: add
s
upport
t
o
pu
s
h
U
R
Ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contreras
remote-bzr:
fix
b
a
d stat
e
i
ssue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Fel
i
pe Contreras
r
emot
e
-
h
g:
r
e
move ex
t
ra check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contrer
a
s
re
m
ote-helpers: tri
v
ial
cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hama
n
o
Merg
e
branch 'fc/
r
emote-h
g
'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ham
a
no
M
e
rge branc
h
'fc/re
m
o
te-bzr'
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o
C Hamano
Merge b
r
anch 'jc/warn
-
path
l
es
s
-add-finishing-to
u
ch
e
s'
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o C Ha
m
ano
git
a
dd: avoid "-
u
/-A without pa
t
hspe
c
" warni
n
g
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
J
u
n
io
C Hamano
Syn
c
with 1
.
8
.
2
.
2
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Git 1
.
8
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Ju
n
io C Hamano
Merge branch 'j
k
/a-thr
e
a
d-only-d
i
es-once' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2013-04-26
J
unio
C
Hamano
Merge bra
n
c
h
'
jn/gitw
e
b-i
n
st
a
ll-doc'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2013-04-26
Juni
o
C Hamano
Merge branch 'fc/untrack
e
d-zsh-p
r
o
m
pt' in
t
o maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge bran
c
h 'jk/receive-p
a
ck-deadl
o
cks-with-early
.
.
.
commit
|
commitdiff
|
tree
2013-04-26
Junio C
Ha
m
an
o
Merge branch
'
jk/c
h
opped-i
d
ent' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ha
m
ano
Mer
g
e branch 'rt/
c
om
m
e
n
t
char
-
fmt-merge-ms
g
' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ham
a
no
Merge br
a
nch 'rs/e
m
pty-a
r
chive' into maint
commit
|
commitdiff
|
tree
2013-04-26
J
unio
C H
a
mano
Me
r
ge branch 'pe/pull-r
e
b
a
se
-
v-q' i
n
t
o
m
ain
t
commit
|
commitdiff
|
tree
2013-04-26
Torsten
Böge
r
s
hausen
t74
0
9
:
d
o not use export X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
T
orsten Bögershau
s
en
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ögershausen
test-hg-bidi
.
sh: do no
t
use export X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Torst
e
n
B
ö
gershausen
t
9
501
:
do not use export
X
=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Tor
s
ten Bögershausen
t9020: do not use export X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
Felipe
Contreras
remote-bzr:
use proper push method
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
René Sc
h
arfe
pre
t
ty:
re
m
o
ve intermediate str
b
ufs fr
o
m p
p
_u
s
er_in
f
o
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
René S
c
h
arfe
pretty: simpli
f
y ou
t
p
ut line len
g
t
h calculat
i
on in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
Ren
é
Scharfe
pretty:
s
implify
inp
u
t
l
ine length calculation
i
n pp_u
s
er_
i
nfo()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
Zoltan
Klinger
bash-pro
m
pt
.
s
h: sho
w
whe
r
e
r
ebase is at
when stopped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-24
Junio C Hamano
Merge branch 'jk/remote-helper-with-si
g
ned
-
tags
'
commit
|
commitdiff
|
tree
2013-04-24
Ju
n
io
C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2013-04-24
Junio C Haman
o
U
pdate draft r
e
lease notes to 1
.
8
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next