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
René
Scharfe
unpack-trees: c
r
ea
t
e w
o
rking co
p
y of m
e
rge ent
r
y
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Ren
é
Scha
r
fe
un
p
a
c
k-tree
s
: factor o
u
t dup_entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Re
n
é
S
charfe
r
e
ad-cache: m
a
rk cache_entry
p
o
inter
s
co
n
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René
Scharfe
cach
e
:
mar
k
cache_
e
ntry poi
n
ters co
n
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-24
Junio
C Ha
m
a
no
Git 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felip
e
Co
n
t
r
eras
remote-hg: fix order of configur
a
tion co
m
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Contreras
remote-hg:
trivial configuration
n
ote cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Feli
p
e Cont
r
eras
completi
o
n
:
regression fix f
o
r zsh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-20
Junio C Hamano
M
e
r
g
e g
i
t://git
.
b
ogomips
.
or
g
/
git-
s
vn
commit
|
commitdiff
|
tree
2013-05-20
A
m
it B
a
kshi
r
emote-hg:
s
e
t
stdout to binary mode on win32
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Git 1
.
8
.
3-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Juni
o
C Hamano
Mer
g
e
branc
h
'fc/do
c
-styl
e
'
commit
|
commitdiff
|
tree
2013-05-17
Jun
i
o C Hamano
Merge br
a
nc
h
'dw/asci
i
doc-sou
r
ces-
a
re-do
t
-txt-files'
commit
|
commitdiff
|
tree
2013-05-17
Fel
i
p
e
C
ont
r
eras
documentation: trivial style cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio C
Hamano
M
erg
e
git://ozlabs
.
o
r
g/~paulus/gitk
commit
|
commitdiff
|
tree
2013-05-17
John Ke
e
ping
diff
t
ool: fix d
i
r
-diff
when file doe
s
n
o
t exis
t
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
F
e
lipe Co
n
trera
s
re
m
ote-
b
z
r
: fixes for older ver
s
i
o
n
s of bzr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Sandor Bo
d
o-Merle
remote-bzr: fix old
o
rg
a
ni
z
ation destroy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
F
elipe Contre
r
as
Revert "remote-hg: upda
t
e
book
m
arks
w
hen
p
ul
l
ing
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Dale R
.
W
o
r
l
ey
gi
t
-subm
o
dule
.
txt: Clarify 'init' and 'ad
d
' subcommands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felip
e
Contrer
a
s
r
emote-bzr: f
i
x cloning of
n
on-lis
t
able r
e
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Juni
o
C
Hamano
Merge bra
n
ch 'fc/remote-hg' (early part)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
rem
o
t
e
-
h
g: upda
t
e
bookmarks when pulling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Cont
r
eras
remot
e
-hg: don'
t
pu
s
h
f
ake 'master'
bookmark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
l
ipe Contreras
remote-hg: dis
a
ble
f
orced push
by defa
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
elipe Contr
e
ras
remote-
h
g: fix new branch cr
e
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
r
emote-
h
g: add new get
_
config_
b
ool() helpe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Con
t
rera
s
remote-hg: enable t
r
a
c
k-branches in h
g
-
g
it mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote-hg: get rid of un
u
sed e
x
c
eption chec
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe Contrer
a
s
remote-hg:
t
r
ivial cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-14
Fel
i
pe Contr
e
ras
remote-bz
r
:
u
p
date old organization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Jun
i
o C Hamano
Git 1
.
8
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
J
unio C Hama
n
o
Merge git:/
/
oz
l
abs
.
or
g
/
~
pa
u
l
u
s
/gitk
commit
|
commitdiff
|
tree
2013-05-11
Torsten Bögershausen
te
s
t-bzr
:
do not use unportable s
e
d
'\+
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
Ju
n
io C Hamano
Mer
g
e git:/
/
git
.
bogomi
p
s
.
o
rg/git
-
svn
commit
|
commitdiff
|
tree
2013-05-10
D
a
le
W
orley
Cod
i
ngGu
i
delines: Doc
u
mentati
o
n/
*
.
txt
are the
sources
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
J
u
n
i
o
C Haman
o
G
it 1
.
8
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
J
u
n
io
C
Ha
m
ano
Merge branch
'mv/s
e
quencer-pick-error-d
i
a
g'
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
cherry
-
pick: picking a
t
ag that resolve
s
to a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio
C Hamano
M
erge b
r
anch 'tr/copy-rev
i
sio
n
s-from-st
d
in' i
n
to maint
commit
|
commitdiff
|
tree
2013-05-09
R
ené Scharfe
t500
4
:
a
void us
i
ng
t
ar for check
i
ng empt
i
n
ess of arc
h
iv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
R
ené Schar
f
e
t5004: ignore pax
glob
a
l
header file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
mergetools/kdif
f
3: do not use --a
u
t
o when diffi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Felipe Contreras
transpo
r
t-help
e
r: trivial
s
t
y
le cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio
C
Hamano
Update draft
re
l
e
a
se note
s
for 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Cont
r
er
a
s
r
emote-h
e
l
pe
r
s:
t
ri
v
i
a
l cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe
C
ontre
r
as
r
e
mote-bzr: fix for disapp
e
a
r
ed revisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Hamano
Merg
e
git:
/
/github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-05-07
Jun
i
o C H
a
m
a
n
o
Me
r
ge branch 'jk/merge-tree-
a
dd
e
d-identically'
commit
|
commitdiff
|
tree
2013-05-07
John
K
eeping
m
e
rge-tre
e
:
handl
e
director
y
/empty co
n
flic
t
c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Ham
a
n
o
Merge branch 'fc
/
remote-bzr'
commit
|
commitdiff
|
tree
2013-05-07
Fe
l
i
pe Co
n
treras
remote-bzr
:
avoid bad refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Felipe Contrera
s
remote-bzr: convert
all unicode keys to str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
Junio C H
a
ma
n
o
M
e
rg
e
branch 'fc/push-with-export
-
report
i
ng-result'
commit
|
commitdiff
|
tree
2013-05-05
Felipe
C
ontreras
transpor
t
-helper:
improve
p
ush messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Ju
n
io C Hamano
G
i
t 1
.
8
.
3-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Merg
e
b
r
anch 'tr/unp
a
ck-entry-use-
a
fter-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
Junio
C
Ha
m
a
no
Sync with maint
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o
C Ha
m
ano
Merge
b
ra
n
ch
'
tr/remote-t
i
ghten-commandline-par
s
ing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Me
r
ge branch
'
jn/glo
s
s
a
ry-rev
i
sion'
i
nto
maint
commit
|
commitdiff
|
tree
2013-05-03
Fe
l
ipe
C
ontreras
co
m
pletio
n
: zsh: d
o
n't
o
verride s
u
ffix on
_
d
et
a
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Ander
s
G
r
a
nskog
e
n
.
.
.
Docu
m
entatio
n
/git-c
o
m
mit: Typo unde
r
--edi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ha
m
ano
Updat
e
d
raft re
l
ease notes
to 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Ma
r
c Branchaud
Fix g
r
a
m
mar in
t
he 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
Me
r
g
e
b
ra
n
ch 'hb/git-pm-tempfile
'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ham
a
no
Merge branc
h
'
rs/pp
-
user
-
in
f
o-wit
h
o
ut-extra-a
l
l
o
cation'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
M
erge bran
c
h 'tr/remote-tig
h
ten-commandl
i
ne-parsing'
commit
|
commitdiff
|
tree
2013-05-01
J
u
n
io
C
Hamano
Mer
g
e
b
r
anch 'zk/prompt-re
b
a
s
e
-
s
t
ep'
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
r
emote-b
z
r: access branches only
when
n
eede
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-b
z
r: dela
y
peer branch usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
re
m
ot
e
-bzr: ite
r
ate revis
i
ons properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: impr
o
ve progress reportin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contre
r
as
remote-bz
r
: add option to
s
p
e
c
ify branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
r
e
mote-bzr:
a
dd custom method to find br
a
nches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
pe Contreras
remote-bzr: improve author sanitazio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
n
t
r
eras
re
m
ote
-
bzr: a
d
d support for shared
r
epo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
rem
o
te-bz
r
: f
i
x branc
h
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Con
t
r
e
ras
r
e
mote-bz
r
: add sup
p
ort for bzr repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bz
r
: u
s
e branch variable whe
n
appr
o
priate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Cont
r
eras
rem
o
te-b
z
r
: fix
partially pushed merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
r
emo
t
e-bz
r
: fixes fo
r
branc
h
diverge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
rem
o
te-bzr:
a
dd suppor
t
to p
u
sh merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe
Contre
r
as
r
e
mote-bzr: alwa
y
s
try to
updat
e
the wo
r
ktre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
p
e
Co
n
treras
r
e
mote-
b
zr: fix order of locking
in CustomTree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
ntreras
remote
-
bzr
:
delay blob fetch
i
ng until the very end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Contrer
a
s
remote-bzr:
cleanup Cust
o
mTr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-30
Thomas
Rast
unpack_en
t
r
y: avoid f
r
eeing ob
j
ects in
b
ase cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
a
mk
u
ma
r
Ramachand
r
a
git-c
o
mp
l
etion
.
bash
:
add r
e
mote
.
pushd
e
fa
u
lt to config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-comp
l
etion
.
bash: add
branch
.
*
.
pushremote to
c
onfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-04-29
Junio C
Hamano
Merg
e
b
ranch 'fc
/
z
sh-co
m
pletion' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2013-04-29
F
e
lipe Contreras
complete: zs
h
: use zsh completion f
o
r th
e
main cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Feli
p
e Contreras
complete
:
zsh:
t
rivial simplific
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ra
m
a
c
han
d
r
a
g
i
t-co
m
ple
t
io
n
.
bash: complete
bran
c
h
.
*
.
r
e
base as boo
l
ean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-comp
l
et
i
o
n
.
bash: add diff
.
submodule
t
o config li
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-com
p
l
eti
o
n
.
bash
:
lexi
c
al
s
o
rting
for diff
.
statGraphW
i
dth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
H
.
M
erijn Brand
Gi
t
.
pm: cal
l
tempfile
from Fi
l
e::Te
m
p as
a
r
e
gul
a
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio
C H
a
m
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2013-04-28
F
e
lipe Co
n
tre
r
a
s
documentation:
t
rivial whitespace
cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next