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
unpack-trees: create working copy of merge entry in merged_entry
2013-06-02
Re
n
é
S
c
harfe
un
p
ack-trees: create
working
copy of
m
erge entry in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René Scharfe
u
n
pack
-
trees: fa
c
tor out dup_entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Ren
é
Schar
f
e
read-ca
c
h
e
:
m
ark c
a
che_e
n
try pointers const
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Ren
é
Sc
h
a
r
fe
c
a
che: ma
r
k
cache_
e
ntry point
e
rs const
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-24
Jun
i
o
C Hamano
G
it 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Con
t
re
r
as
remote
-
hg: fix order of configur
a
tion comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Con
t
r
e
ra
s
remo
t
e-hg: triv
i
al
configuration
note cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
F
e
lipe Contre
r
as
completion: regression
fix for
z
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-20
Junio C Ham
a
no
Me
r
ge git://git
.
bogomips
.
org
/
git-sv
n
commit
|
commitdiff
|
tree
2013-05-20
A
m
i
t Bakshi
remote-hg: se
t
stdout to
binary
m
ode
on w
i
n3
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Git
1
.
8
.
3-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio
C
Hamano
Merge
b
ranch 'fc
/
do
c
-
styl
e
'
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Merge bra
n
c
h
'dw/asciidoc-sources-are-dot-txt-files'
commit
|
commitdiff
|
tree
2013-05-17
Fe
l
ipe Contreras
docume
n
tati
o
n: trivial style cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
J
unio C Hamano
Merge git://ozla
b
s
.
org/~paulus
/
git
k
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keeping
difftool: fix
d
i
r-di
f
f when
f
ile
d
oes not exist
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
F
e
l
i
pe Contreras
remote-bzr: f
i
xes for older versions
o
f
b
zr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
S
a
n
do
r
Bodo-Merle
remote-
b
zr: fix old orga
n
ization destr
o
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Co
n
tre
r
as
Revert "
r
e
m
o
t
e-hg:
update b
o
okmarks when
p
u
lli
n
g"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Dale R
.
W
orley
g
i
t
-submod
u
le
.
txt: Cla
r
ify 'init' a
n
d 'add'
s
ubcomman
d
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Contreras
remote
-
bzr: fix cl
o
n
ing of
n
on-
l
ista
b
le r
e
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Junio
C Hamano
Me
r
ge branch
'
fc
/
remote-hg
'
(early p
a
rt)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
re
m
ote-hg: up
d
ate book
m
arks w
h
e
n pu
l
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Fe
l
ipe Co
n
t
r
eras
remote-
h
g: don't pus
h
fake 'master'
bo
o
k
m
ark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
r
e
mote-hg:
disa
b
le f
o
rc
e
d pu
s
h
b
y
default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
C
o
ntre
r
as
r
e
mote-hg: fix
n
ew b
r
anch creat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote
-
hg: add new get_config_bo
o
l() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe C
o
n
treras
remote-hg:
e
nable track-branches in hg-git m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Co
n
treras
remote-hg: get rid of unu
s
ed exceptio
n
checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
Contreras
r
e
mote-hg:
trivial clean
u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-14
Felipe Con
t
reras
remote-bzr: update o
l
d organi
z
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Ham
a
n
o
Git 1
.
8
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
J
unio C Ham
a
no
Merge
g
it:/
/
ozlabs
.
o
r
g/~p
a
ul
u
s/gitk
commit
|
commitdiff
|
tree
2013-05-11
Torsten
Bögershausen
t
est-bzr: do
not
use u
n
portable sed '\+'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
Ju
n
io C Ham
a
n
o
M
e
rge
g
it://
g
it
.
bogomips
.
o
rg
/
git
-
svn
commit
|
commitdiff
|
tree
2013-05-10
Dale Worley
C
o
d
ingGuidelines: Do
c
umentation
/
*
.
txt
a
re th
e
s
ources
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
Sync with v1
.
8
.
2
.
3
commit
|
commitdiff
|
tree
2013-05-09
Junio C H
a
man
o
Git 1
.
8
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
J
u
nio C Hama
n
o
M
erge b
r
anch 'mv/s
e
quen
c
er-
p
ick-error-diag'
commit
|
commitdiff
|
tree
2013-05-09
Junio C Ha
m
ano
che
r
ry-pick: picking a tag that
r
eso
l
ves to a c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
Merge b
r
a
nch 'tr/copy-revisio
n
s
-
from-stdi
n
' into maint
commit
|
commitdiff
|
tree
2013-05-09
Ren
é
Scharfe
t5004
:
a
void us
i
ng tar
f
or
c
heckin
g
empti
n
e
s
s
of arch
i
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
René S
c
h
a
rfe
t5004: ignore pax
g
l
obal header f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
merg
e
too
l
s/kdiff3: do not use --
a
uto when diffing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Feli
p
e Contre
r
as
tra
n
s
p
o
r
t
-helper:
t
r
ivia
l
style cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Hama
n
o
Up
d
ate draft release notes for 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contreras
r
emote-helpers: t
r
ivi
a
l
cleanu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe C
o
n
t
reras
re
m
ote-bzr: fix for
d
isappeared revis
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio
C
Hamano
Merge git://github
.
com/gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
2013-05-07
Jun
i
o
C Haman
o
Merge
b
ranch
'j
k
/merge-tree-
a
dded-identically'
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
merge-tr
e
e:
h
a
ndle directo
r
y/empt
y
conflict cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio C
Hamano
Merge branch
'
fc
/
r
emote-bzr'
commit
|
commitdiff
|
tree
2013-05-07
F
e
li
p
e Contreras
r
emot
e
-b
z
r
: a
v
oid bad refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Felip
e
Contreras
remote-b
z
r:
c
on
v
ert all uni
c
ode keys to
s
tr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
Juni
o
C
H
ama
n
o
Merge br
a
nch 'fc/push-with-export
-
reporting-r
e
s
u
lt'
commit
|
commitdiff
|
tree
2013-05-05
Feli
p
e Contreras
trans
p
ort-h
e
lp
e
r: improve push messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
J
unio C Ha
m
ano
Git 1
.
8
.
3-r
c
1
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
Junio C Hamano
Syn
c
with m
a
i
nt
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o
C Ha
m
ano
Merge branch 'tr/remo
t
e-t
i
g
h
te
n
-
c
ommandline
-
p
a
r
s
i
ng
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
M
erge bra
n
ch
'
jn/glossary-
r
evision
'
into mai
n
t
commit
|
commitdiff
|
tree
2013-05-03
Fel
i
pe
Co
n
trera
s
completion:
zsh: don't
o
verride suffi
x
o
n _detau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
A
nd
e
rs Gra
n
s
k
o
gen
.
.
.
Doc
u
mentation/git-commit: Typo unde
r
--edit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C H
a
mano
Updat
e
draft release n
o
tes to 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Marc Branchau
d
F
ix gra
m
mar i
n
th
e
1
.
8
.
3 re
l
e
a
se
n
otes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C H
a
mano
Merge branch 'hb/git-pm-t
e
m
p
f
ile'
commit
|
commitdiff
|
tree
2013-05-01
Junio C
Hama
n
o
Merg
e
bran
c
h 'rs/pp-user-in
f
o
-without
-
e
x
tra-allo
c
at
i
o
n'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge
b
ranch 'tr/remote-tighten-comma
n
dline-parsing'
commit
|
commitdiff
|
tree
2013-05-01
Junio C H
a
mano
Merge b
r
a
n
ch 'zk/p
r
om
p
t-r
e
ba
s
e-
s
tep'
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e
C
o
ntreras
r
em
o
te-bzr: access branches o
n
ly when needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrera
s
remote
-
bzr
:
delay peer
b
ranch usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e
C
on
t
rera
s
remote-bzr: iterat
e
revisions
p
roperl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
rer
a
s
remote-bzr: impr
o
ve prog
r
ess
r
eporting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ont
r
eras
remote-bzr: add o
p
ti
o
n to spec
i
fy
br
a
nch
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contr
e
ras
remot
e
-bzr: add c
u
stom method to
f
i
nd branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Cont
r
era
s
remote-bzr:
improve author sanitazion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
r
e
ras
remote-
b
zr: add support
for shared rep
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrer
a
s
re
m
o
te-bzr
:
f
i
x bra
n
ch nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
n
t
reras
remote-bzr
:
add support for b
z
r repo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contr
e
ra
s
remote
-
bzr: use
branch vari
a
ble when appropria
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
r
e
mote-bzr
:
fix partially pushed merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe Contreras
remote-bzr: fixes for
br
a
nc
h
diver
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe
C
ontreras
rem
o
te-bzr: add sup
p
ort to push merge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrer
a
s
r
e
mote-bz
r
: always t
r
y to updat
e
th
e
worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
rem
o
te-bzr: fi
x
or
d
er
of lock
i
ng i
n
CustomTr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: del
a
y
blob fetc
h
ing unt
i
l the very end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contre
r
as
remot
e
-bzr: c
l
ean
u
p Cus
t
omTree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-30
Thomas
R
ast
unpack_e
n
try: avoid freeing objects in
base ca
c
he
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ra
m
kum
a
r Ramachand
r
a
g
i
t-completion
.
b
a
s
h
: add re
m
ote
.
pus
h
defau
l
t to c
o
nfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramacha
n
dra
git-co
m
pl
e
tion
.
bash: add br
a
nch
.
*
.
p
u
shremote to
c
o
nfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Junio C
H
a
m
a
no
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2013-04-29
Juni
o
C
H
a
mano
M
e
rg
e
br
a
nch 'fc/zsh-completion' into
maint
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contrer
a
s
compl
e
te: zsh:
use zsh completion for the mai
n
cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
F
e
lipe
C
ont
r
eras
compl
e
t
e
:
zsh: trivial simplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramacha
n
dra
git
-
com
p
letion
.
b
a
sh: complete branch
.
*
.
rebase as
b
o
olean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
a
mkumar Ramach
a
ndra
git-complet
i
on
.
bash
:
add diff
.
s
u
bmodu
l
e to config list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkuma
r
Ram
a
ch
a
ndra
git-com
p
letion
.
b
a
sh:
lexical sorting
for diff
.
st
a
tGraphWidth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merij
n
Brand
Gi
t
.
pm: call tempfile fr
o
m File::Temp as
a regular
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-04-28
Felipe Co
n
tr
e
ras
document
a
tion: triv
i
al whites
p
ace cl
e
anups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next