repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
push: avoid suggesting "merging" remote changes
2013-07-07
John Keepin
g
push
:
avoid suggesting "merging" r
e
m
o
te changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-24
J
unio C Hamano
Git
1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
Felip
e
Contre
r
as
remote-hg:
fix order of c
o
n
f
i
g
uratio
n
comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Contr
e
ras
r
em
o
te-hg
:
triv
i
al configuratio
n
n
o
t
e
cleanup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Contreras
com
p
letio
n
:
regression
f
ix for zsh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-20
Ju
n
io C
Hamano
M
er
g
e git
:
//git
.
b
o
g
omips
.
org
/
g
it
-
svn
commit
|
commitdiff
|
tree
2013-05-20
A
m
it
Bakshi
remote-hg: set
stdout to bina
r
y m
o
de on wi
n
32
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Junio C
H
amano
Git 1
.
8
.
3-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Junio C Ha
m
ano
Merge branch 'fc/doc
-
style'
commit
|
commitdiff
|
tree
2013-05-17
J
u
nio C Hamano
Merge branch 'dw/asci
i
doc-so
u
r
ces-are
-
dot-txt-files'
commit
|
commitdiff
|
tree
2013-05-17
Felipe Contreras
documentation: trivial styl
e
cleanu
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
J
u
n
io C Hamano
Merge git://o
z
labs
.
o
r
g/~paulus
/
gitk
commit
|
commitdiff
|
tree
2013-05-17
John
K
ee
p
ing
difftool: fix dir-diff w
h
en file doe
s
not exist in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Felipe
Contr
e
r
as
r
e
m
o
te-
b
zr:
f
ixes f
o
r ol
d
e
r
versions of bzr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Sando
r
B
o
d
o-
M
e
r
l
e
remote-bz
r
: fix o
l
d
o
rgan
i
zation destroy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
F
e
lip
e
Contreras
Revert
"
r
emote-hg: update bookmarks
w
hen
p
ulling"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
D
ale R
.
Worley
git-submo
d
u
le
.
txt: Clarify 'init' and
'add' subcommands
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Contreras
remote
-
bzr: fix clon
i
ng of non-listable repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Ju
n
io C Hamano
Merge branch 'fc/remote-hg'
(early part)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Cont
r
eras
remote-h
g
: update bookmar
k
s
when pulli
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe C
o
ntreras
remote-
h
g: don't push
f
ake
'
master' boo
k
mark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Con
t
re
r
a
s
remote-hg: disabl
e
f
o
rced
p
u
s
h by
default
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felip
e
Co
n
trer
a
s
re
m
o
te-hg: fix new
b
ranch cr
e
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote-hg:
a
d
d new get_c
o
n
f
ig_bool() hel
p
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe
C
ontrer
a
s
remote-hg: enable track-bra
n
ches in
hg
-
git m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
C
ontre
r
a
s
remote-hg:
get rid of unus
e
d
excepti
o
n check
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
C
ont
r
eras
remote-hg: trivial cle
a
nups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-14
Fe
l
ipe Con
t
reras
remote
-
bzr: u
p
date old organization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Hamano
Git 1
.
8
.
3-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Hama
n
o
Merge git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2013-05-11
Torsten Bögersha
u
sen
test-b
z
r: do no
t
use
un
p
ortable sed '\+
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-11
Junio C Haman
o
Merge git://git
.
b
o
g
omips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-05-10
Dale Wor
l
ey
C
oding
G
uidel
i
nes:
D
ocumentation/*
.
txt are the s
o
urces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Ju
n
io C Hamano
Sy
n
c
w
ith v1
.
8
.
2
.
3
commit
|
commitdiff
|
tree
2013-05-09
J
unio C Hamano
Git
1
.
8
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
J
unio
C
Hamano
Merge branc
h
'm
v
/
seq
u
encer
-
pick-
e
rror-diag'
commit
|
commitdiff
|
tree
2013-05-09
Junio
C Hamano
cher
r
y-pick: picki
n
g a tag tha
t
reso
l
ves
to a commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
J
u
nio C Hamano
M
erge branch '
t
r/co
p
y-r
e
visions-from-stdin' into
maint
commit
|
commitdiff
|
tree
2013-05-09
Ren
é
Sc
h
arfe
t5004: avoid using tar for
c
hecking empti
n
ess of archive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
René Schar
f
e
t5004:
i
gnore pax gl
o
bal header file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Agu
i
lar
m
er
g
etools
/
kdiff3: do not use -
-
aut
o
when diffing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Felipe Cont
r
eras
transport-helper: trivi
a
l style cleanup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Ham
a
no
Update draft re
l
ea
s
e notes for 1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
F
e
lip
e
Contr
e
r
as
r
emote-helpers: t
r
i
v
i
al cleanu
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
F
elipe Contreras
remote-bzr:
fix
f
or di
s
appeare
d
revi
s
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
J
unio C Hamano
Merge git://
g
ithub
.
com/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2013-05-07
Juni
o
C Hamano
M
erge b
r
anch 'jk/merge-tree-added-identi
c
a
lly'
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
erge-t
r
ee: handle di
r
e
ct
o
ry/empty conflic
t
correc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
J
u
ni
o
C Hama
n
o
Merge br
a
nch 'fc
/
r
e
mote-bzr'
commit
|
commitdiff
|
tree
2013-05-07
F
e
l
i
p
e
Co
n
t
reras
r
em
o
te
-
bzr: avoid
b
a
d refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-06
Fel
i
p
e
Contreras
r
e
mote-bzr: convert all
u
nicod
e
keys to s
t
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-05
Juni
o
C H
a
mano
Merge b
r
an
c
h 'fc/pu
s
h-with-expo
r
t-reporting-re
s
ult'
commit
|
commitdiff
|
tree
2013-05-05
Felipe Contreras
trans
p
ort-helper: improve
push
me
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio
C Hama
n
o
Git 1
.
8
.
3
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
J
u
n
io C Ha
m
a
no
Me
r
ge branch '
t
r
/
u
npack-entry-use-after-free-f
i
x
'
commit
|
commitdiff
|
tree
2013-05-03
Junio C
Hamano
Sync wit
h
mai
n
t
commit
|
commitdiff
|
tree
2013-05-03
J
unio C Ha
m
a
n
o
M
erg
e
bran
c
h
'tr/remote-tigh
t
e
n
-com
m
and
l
ine-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Juni
o
C
Hamano
Merge
branch 'jn/glossary-re
v
ision'
into maint
commit
|
commitdiff
|
tree
2013-05-03
Felipe C
o
n
t
reras
completion: zsh: don't
o
verride suffix
o
n _d
e
tault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
Anders Granskogen
.
.
.
Docum
e
ntation/git-
c
ommit: Typo und
e
r
-
-edi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Jun
i
o
C Hamano
Upda
t
e
d
raft releas
e
notes
t
o 1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Marc Branchaud
F
i
x
gramm
a
r in t
h
e 1
.
8
.
3 rele
a
se notes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge branch
'hb/git-pm
-
tem
p
file
'
commit
|
commitdiff
|
tree
2013-05-01
Junio
C Hamano
Merge b
r
anch 'rs/pp-user-info-without-extra-all
o
ca
t
i
o
n'
commit
|
commitdiff
|
tree
2013-05-01
Junio
C
Hamano
Merge
branch 'tr/remote-tighte
n
-com
m
andline-parsing'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
M
e
rg
e
branch
'zk/prompt-
r
ebas
e
-step
'
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contreras
r
emote-bzr: acce
s
s
branches only when
needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: d
e
lay
peer branch us
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrera
s
r
e
mote-b
z
r: i
t
erate r
e
visi
o
ns
p
roperly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: improve
progress
re
p
orting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contr
e
ra
s
rem
o
te-bzr: add option t
o
specify
branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contreras
rem
o
te-bzr: add custom meth
o
d to find
b
ranches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
remote-bzr
:
improve auth
o
r sanitazion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
eli
p
e
Con
t
reras
remote-bzr: add suppor
t
f
o
r
shared repo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
remote
-
b
zr: fix branch names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-
b
z
r:
a
d
d
s
uppo
r
t for bzr repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
rem
o
te-bzr
:
use
b
r
anch variable when a
p
propriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
remote-bzr: f
i
x
p
artially p
u
shed mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Contrer
a
s
re
m
ote-bzr: fixes for
br
a
n
ch diverge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Cont
r
eras
remote-bzr: add supp
o
rt
to
pus
h
merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
remote-bzr: always try
to up
d
a
t
e the worktree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote
-
bzr: fix order of lo
c
kin
g
in CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
ntrera
s
remote-b
z
r:
delay blob fetching
u
ntil
t
h
e
very
e
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe Contreras
rem
o
te-bzr: cleanup CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
Thomas Rast
unpack_entry: avoid freein
g
objects
i
n
b
a
se
c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-completi
o
n
.
bas
h
: add remote
.
pushdefault to con
f
ig
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramach
a
ndra
git-comp
l
e
t
i
on
.
bash:
a
dd branch
.
*
.
pushremot
e
to config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Junio C H
a
mano
Merge
b
ran
c
h 'maint
'
commit
|
commitdiff
|
tree
2013-04-29
Ju
n
io C Ham
a
no
Merge
b
r
a
n
ch 'fc/zsh-c
o
mpletion' into
maint
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contrer
a
s
complete:
z
sh: use zsh completio
n
for the ma
i
n cm
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Fe
l
ipe C
o
ntreras
c
o
mpl
e
te: zs
h
: trivial simpli
f
ication
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar
R
am
a
chandra
g
i
t-completion
.
ba
s
h
: co
m
plete branch
.
*
.
re
b
ase as boolean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
R
amkum
a
r R
a
m
a
chandra
git-completion
.
b
a
s
h
: add diff
.
submodu
l
e to
c
onfig list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar R
a
machandra
git-compl
e
tion
.
bash: lexical sorti
n
g for diff
.
s
t
a
tGraphWidth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Mer
i
jn Br
a
nd
G
i
t
.
pm: call tempfile from File::Temp
a
s a regula
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
J
u
nio C
H
a
m
a
n
o
Mer
g
e branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2013-04-28
F
e
lipe Contreras
docume
n
tation:
trivial
whitespa
c
e
cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile:
r
emove smoke test target
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C
H
amano
Merge branch 'nd/pretty-forma
t
s
'
commit
|
commitdiff
|
tree
2013-04-28
Rams
a
y
J
ones
pretty: F
i
x bug in truncation support for %>, %< and %>
<
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next