repo.or.cz
/
git
/
jrn.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
Junio C Hamano
Me
r
ge branch 'jk
/
merge-tree-adde
d
-identically'
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle
d
irectory/
e
mpty conflic
t
c
orrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
M
er
g
e branch 'fc/re
m
ote-bzr
'
commit
|
commitdiff
|
tree
2013-05-07
F
elipe Contrer
a
s
r
e
mot
e
-
bzr:
avoid bad refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-06
Fel
i
pe Contrera
s
remot
e
-bzr
:
convert all uni
c
o
de keys
to str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-05
Junio C
H
amano
Merge branch
'
fc/pu
s
h-with-expo
r
t-reporti
n
g
-result'
commit
|
commitdiff
|
tree
2013-05-05
Fe
l
ipe Contrer
a
s
tr
a
ns
p
ort-help
e
r: improve push mes
s
a
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Haman
o
Git
1
.
8
.
3
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Merge branch 'tr/unpack-entry-use-after-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o C
H
a
mano
Syn
c
with maint
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
M
e
r
ge branch
'tr/remote-tigh
t
e
n
-commandline
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio
C
Haman
o
Merge branch 'j
n
/glossar
y
-revision'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2013-05-03
Fe
l
i
p
e Contreras
comp
l
etion: zsh: don't override s
u
ffix on _detault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
Ande
r
s
G
ranskogen
.
.
.
D
ocument
a
tion/g
i
t
-
commi
t
: Typo 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
Marc Branchaud
Fix gram
m
a
r
i
n the 1
.
8
.
3 r
e
lease
notes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge bra
n
c
h
'
h
b
/git-pm-te
m
p
file'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge bran
c
h 'rs/pp-user-info-wi
t
hout-extra-allocation'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ha
m
ano
M
e
rge branc
h
'tr/remote-tighten
-
c
omma
n
dline-parsing'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hama
n
o
Merge br
a
nch
'zk/prompt-rebase-
s
tep'
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: access branches
only when needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
o
n
t
r
eras
remo
t
e-bzr: de
l
a
y peer branc
h
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
eli
p
e Contreras
remote-bzr: iterate revisions p
r
op
e
rly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-
b
z
r
: improv
e
progress reporting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe Co
n
treras
re
m
ote-b
z
r: add option to speci
f
y branc
h
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contre
r
as
rem
o
t
e
-bzr
:
add custom method to find branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: im
p
rove au
t
h
or san
i
tazion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrer
a
s
remo
t
e-
b
z
r
: add support fo
r
sh
a
red repo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote
-
b
zr: fix branch names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e C
o
ntreras
r
emote-
b
zr: add supp
o
r
t
f
or
bzr repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe Contreras
remote-bzr: use branch varia
b
l
e
when appropri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contre
r
as
r
emote-bzr: fix
p
artia
l
ly
pushed m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contreras
r
e
mote-
b
zr: fi
x
es for branch diver
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
remote
-
b
zr: add support to push merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e
C
ontrer
a
s
remote-bzr: alw
a
ys try
to update the
wo
r
k
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
re
m
ote-bzr:
f
ix order of locking in Cu
s
tomTr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe Contreras
remo
t
e-bz
r
:
delay blob fetc
h
ing until the ve
r
y
e
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e
C
o
ntrera
s
remo
t
e
-
bzr: cleanup CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
Tho
m
as Rast
u
n
p
ack_ent
r
y: a
v
o
id free
i
ng obj
e
c
ts in
b
ase cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramacha
n
dra
git-comp
l
etion
.
bash: add remote
.
pushdefault to config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ram
a
chandra
git-co
m
ple
t
i
o
n
.
bash: add
b
ranch
.
*
.
pushr
e
mo
t
e to
c
o
n
f
i
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Junio C Haman
o
M
erge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2013-04-29
J
uni
o
C Hamano
Merge branch 'fc/zsh-completion' into
m
a
i
nt
commit
|
commitdiff
|
tree
2013-04-29
Felip
e
Contreras
complete: zs
h
: use zsh completion
for
t
he main cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contreras
complete: zsh: trivial simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-completion
.
bash: complete branch
.
*
.
r
e
base as bo
o
lean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ram
k
umar Ramach
a
ndra
gi
t
-
c
ompletion
.
bash: add
di
f
f
.
submodule
t
o config list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramku
m
ar Ramachan
d
r
a
g
i
t-completion
.
b
ash: lexical sor
t
ing
f
or dif
f
.
statGr
a
phWidth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Me
r
ij
n
B
r
and
Git
.
p
m: call te
m
pfile from F
i
le::Tem
p
as a
regular
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Jun
i
o
C
Hamano
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2013-04-28
F
e
lipe Co
n
trer
a
s
d
o
c
umentati
o
n: t
r
ivial whitespace cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
n
g
t/
M
a
kefile: re
m
ove
smoke test targets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Merg
e
branch 'n
d
/pretty
-
form
a
ts'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jone
s
pr
e
tty: Fi
x
bug
i
n
t
r
u
n
cation support for
%
>, %< and %><
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Ham
a
no
M
e
r
ge b
r
anch 'jk/c
h
eck
-
corrupt-objects-ca
r
efully'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
clone: Make
t
he 'junk_
m
ode'
symbol a fil
e
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
J
unio
C
Hamano
Merge br
a
nch '
j
k
/
merge-t
r
ee-added-identi
c
all
y
'
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
erge-tree: fix typo i
n
"
b
oth changed ide
n
tically"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-27
Fe
l
ipe Contreras
completio
n
:
add missing
f
ormat-patch opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
J
u
n
io C Ha
m
ano
Git 1
.
8
.
3
-
rc
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
J
unio C Hama
n
o
Merge branch 'rr/sh
o
rtlog-doc'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge branch 'th/bi
s
ect-skipped-l
o
g'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge branch 'ph/rebase-o
r
i
g
inal'
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o C Hamano
Me
r
ge bran
c
h 'jn/glossary-revision'
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
Hamano
Merge branch
'
jc
/
a
dd-ignore-rem
o
val'
commit
|
commitdiff
|
tree
2013-04-26
Felipe
Co
n
tr
e
ras
re
m
ote-bzr: strip extra ne
w
li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Feli
p
e Contre
r
as
remo
t
e
-bz
r
: tell bazaar to be quiet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Con
t
reras
r
e
mote-bzr: s
t
ore co
n
ver
t
ed URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contreras
r
emote-hg:
u
se
h
ashlib i
n
stead
o
f
hg sha1 util
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Co
n
treras
r
e
m
o
t
e
-bzr:
a
dd
s
upport to push
U
RLs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
F
elipe Con
t
r
eras
remote-bzr: fi
x
bad state issue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Fel
i
pe Contreras
r
emote-
h
g: r
e
m
ove extra check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Felipe Contreras
remote-help
e
rs: tr
i
vial clea
n
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
M
e
rge branch 'fc/remote-hg'
commit
|
commitdiff
|
tree
2013-04-26
Ju
n
io C Hamano
M
erge branch 'fc
/
remo
t
e-b
z
r
'
commit
|
commitdiff
|
tree
2013-04-26
Junio
C Ha
m
ano
Merge
bran
c
h
'
jc/warn
-
pathless-add
-
finishing-touches'
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
git add: a
v
oid "-u/-A without p
a
thspec" warning on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o C Hamano
Sy
n
c
w
i
th 1
.
8
.
2
.
2
commit
|
commitdiff
|
tree
2013-04-26
J
unio
C Hamano
Git
1
.
8
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
Hama
n
o
Merge branch 'jk/a-thread-only-di
e
s
-
o
n
c
e
' in
t
o maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Ham
a
no
Merge
branch
'j
n
/
gitwe
b
-install
-
d
o
c' i
n
to
m
aint
commit
|
commitdiff
|
tree
2013-04-26
Junio C H
a
mano
M
e
rge
b
ranch 'fc/untracked-zsh-prom
p
t' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Mer
g
e branch 'jk/rece
i
ve-pa
c
k-
d
eadlock
s
-with-early
.
.
.
commit
|
commitdiff
|
tree
2013-04-26
Junio C
H
amano
M
erg
e
br
a
nch 'jk/c
h
oppe
d
-i
d
ent'
i
nto m
a
i
n
t
commit
|
commitdiff
|
tree
2013-04-26
Jun
i
o
C
H
amano
Merge branch
'
r
t/commentchar-f
m
t-merge
-
msg' into maint
commit
|
commitdiff
|
tree
2013-04-26
Junio
C
H
amano
Merge branch 'r
s
/empty-archive' int
o
maint
commit
|
commitdiff
|
tree
2013-04-26
Junio C Hamano
Merge bra
n
ch 'p
e
/pull-r
e
base-v-q'
in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2013-04-26
Torsten Böge
r
shause
n
t7409: do not use export X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
T
o
rsten Böge
r
s
haus
e
n
tes
t
-hg-hg-gi
t
.
s
h:
d
o not use expo
r
t X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
To
r
sten Bö
g
ersh
a
usen
test-h
g
-bidi
.
sh: do not use export X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Torsten
Böge
r
shause
n
t9501: do not u
s
e exp
o
rt
X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-26
Torsten B
ö
gers
h
aus
e
n
t9
0
20: do not use
export
X=Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
Felipe Contre
r
as
remote-bzr: u
s
e proper push method
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
René Scharfe
pretty:
r
e
move in
t
ermediate strbufs from pp_user_info()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
René Scharfe
p
retty: simpli
f
y outpu
t
line length calculat
i
on in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
René
Scharfe
pre
t
ty: simplify i
n
put line len
g
th calculation
in pp_use
r
_info()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-25
Zo
l
ta
n
K
l
inger
bash-prompt
.
s
h:
s
h
ow
where rebase
i
s
a
t
when stopped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-24
Junio
C
Haman
o
Merge branc
h
'
j
k/remote-h
e
lper-with-signed-tags'
commit
|
commitdiff
|
tree
2013-04-24
Junio
C
Hamano
Sync with maint
commit
|
commitdiff
|
tree
2013-04-24
Junio C
Hamano
Update draf
t
r
e
l
e
ase notes to 1
.
8
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next