repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unpack-trees: don't shift conflicts left and right
2013-06-17
René Scharfe
unpack-tre
e
s:
don'
t
shift c
o
nflicts
left and right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-24
Juni
o
C Hamano
Git 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
F
e
lipe Con
t
reras
remote-hg: fix order of configuratio
n
comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felip
e
Contr
e
r
a
s
remote-h
g
: tr
i
v
i
al c
o
nfigura
t
ion note cl
e
anup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felipe C
o
n
t
re
r
as
completion: re
g
res
s
ion fix f
o
r z
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-20
J
un
i
o C Hamano
Me
r
ge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-05-20
Amit Bak
s
hi
remote-hg: set st
d
out to binary
mode
on win32
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Juni
o
C
Ha
m
an
o
Git
1
.
8
.
3-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio C
H
amano
Merge
b
ranch
'fc/d
o
c-style'
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Merge branc
h
'dw/asciid
o
c-source
s
-
a
r
e-dot-txt-files'
commit
|
commitdiff
|
tree
2013-05-17
Felipe Co
n
t
rera
s
documentation: tri
v
ial s
t
yle cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Merge git://ozla
b
s
.
o
r
g/~pau
l
us
/
g
itk
commit
|
commitdiff
|
tree
2013-05-17
John K
e
e
ping
d
i
f
ft
o
ol: fix dir
-
d
i
ff wh
e
n
file
does not ex
i
st in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Felipe Co
n
treras
remote-bzr:
f
ixes f
o
r
o
lder versio
n
s o
f
bzr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Sand
o
r Bodo
-
Merle
remot
e
-bzr:
f
i
x old
organization de
s
troy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Contrer
a
s
R
e
vert "re
m
ote
-
hg: updat
e
b
ookmar
k
s
w
hen pulling
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Dale R
.
W
orley
git
-
submodul
e
.
txt: Clarif
y
'init' and 'add' subcommand
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Cont
r
e
r
as
remote-bzr
:
f
i
x c
l
oning
of non-lista
b
le
r
e
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Ju
n
i
o
C
Hamano
Mer
g
e bra
n
ch
'
fc/rem
o
t
e
-
h
g' (ear
l
y part)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Cont
r
eras
remo
t
e-hg:
u
p
date bookmarks when pu
l
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Fe
l
ipe Contreras
re
m
ote-hg: don't push fa
k
e 'master' b
o
okmark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Con
t
reras
remote-hg: disable
forced pu
s
h
by default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Fe
l
ipe Contreras
remote-
h
g:
f
ix ne
w
bra
n
ch crea
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Con
t
reras
remote-hg: add new g
e
t_config_b
o
ol() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Fel
i
p
e Contreras
remote-hg: enable track-branch
e
s
in
h
g-git mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
re
m
o
t
e-hg: get
rid
of unused exception che
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
C
ontreras
remote-hg: triv
i
al cleanup
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-14
F
eli
p
e
C
o
n
t
reras
re
m
o
te-bzr
:
u
p
date o
l
d
o
rganization
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 H
a
mano
Merge
gi
t
://oz
l
abs
.
org/~p
a
ulus/gitk
commit
|
commitdiff
|
tree
2013-05-11
Tor
s
ten Bögersha
u
s
e
n
te
s
t-bzr:
d
o
n
ot use u
n
portable sed '\+'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
Junio C Hama
n
o
Me
r
ge git://git
.
bogomips
.
o
r
g/
g
it-svn
commit
|
commitdiff
|
tree
2013-05-10
D
a
l
e Worley
CodingGui
d
eli
n
es
:
Documentation/
*
.
txt are
t
he sources
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C H
a
mano
S
y
nc with 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
Jun
i
o C Ham
a
no
Merge branch 'mv/sequenc
e
r-pick
-
error-di
a
g'
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
c
herr
y
-p
i
ck: p
i
cking a
t
ag tha
t
resol
v
es to a com
m
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
M
erge br
a
nch 'tr/cop
y
-
re
v
ision
s
-
f
rom-
s
tdin' into ma
i
nt
commit
|
commitdiff
|
tree
2013-05-09
René Scharf
e
t50
0
4:
a
v
oid
u
sing tar f
o
r che
c
king emptines
s
of arch
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
René Sch
a
rfe
t5004: ign
o
re pax global hea
d
er file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetools/kdiff3
:
do not use --auto wh
e
n diff
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Fel
i
pe C
o
ntreras
t
ra
n
spor
t
-hel
p
er:
trivial sty
l
e cle
a
nu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Ha
m
ano
Update dr
a
ft release notes for 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contre
r
a
s
rem
o
te-helpers: trivial cleanu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contrer
a
s
r
emote-bz
r
:
fix for disapp
e
ared revisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio
C
Hamano
Me
r
ge git://github
.
com/g
i
t-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
Me
r
ge bra
n
ch '
j
k/merge-tree-added-identically'
commit
|
commitdiff
|
tree
2013-05-07
John
Keeping
merge-tr
e
e: handle
directory/empty con
f
lict c
o
rrect
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
Merge br
a
nch 'f
c
/remote-bzr
'
commit
|
commitdiff
|
tree
2013-05-07
Felipe Cont
r
eras
remo
t
e-bzr: avoid b
a
d
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Fe
l
ipe Contrera
s
remo
t
e
-bzr: c
o
n
v
er
t
all unic
o
de key
s
to st
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
J
unio C Hama
n
o
Merge branch 'f
c
/
p
ush-with-e
x
port-reporting-r
e
s
ult'
commit
|
commitdiff
|
tree
2013-05-05
Felipe
Co
n
trer
a
s
tran
s
p
o
rt-helpe
r
:
i
m
prove push messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Juni
o
C
Hamano
Git
1
.
8
.
3-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
J
u
ni
o
C Ha
m
ano
Merge
branch 'tr/un
p
ack-entry-use-after-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
J
unio C Hama
n
o
Sync with maint
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hama
n
o
M
e
rge branch 'tr/re
m
o
te-tighten-commandline-parsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
J
u
n
i
o
C Hamano
Merge
b
ranc
h
'jn/
g
lossa
r
y-revision' i
n
to m
a
int
commit
|
commitdiff
|
tree
2013-05-03
F
e
lipe
Contre
r
as
comp
l
etio
n
: zsh: don
'
t override
su
f
f
i
x on _detault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
A
n
ders Gr
a
n
s
kogen
.
.
.
Docum
e
nta
t
io
n
/
git-commit:
T
y
po unde
r
--ed
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
J
u
nio C Hamano
Update draft release no
t
es to 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Marc Branchaud
F
i
x
grammar in
t
h
e 1
.
8
.
3 re
l
e
ase notes
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge branc
h
'hb/git
-
pm-tem
p
file'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge branch
'rs/pp-
u
s
er-info-
w
ithou
t
-
e
xt
r
a-allocation'
commit
|
commitdiff
|
tree
2013-05-01
J
u
n
io C Hamano
Merge branch 'tr/remote
-
tighten-commandline-par
s
i
n
g
'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Me
r
ge branch 'zk/p
r
ompt-rebase-step'
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
re
m
o
t
e-bzr: a
c
c
e
ss
branches only when needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
re
m
ote-bzr: delay peer
b
r
anch usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elip
e
Contreras
remote-bzr: iterate
r
evisio
n
s properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
r
eras
remote
-
b
z
r: improve
p
rogr
e
ss
repor
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contr
e
r
as
r
emote-bz
r
:
a
dd opti
o
n
to spe
c
ify
b
ranches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Con
t
reras
remote-b
z
r:
a
dd cust
o
m method to find bran
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
l
i
pe
Contreras
r
e
mot
e
-bzr: improve author sanitazion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe
C
ontreras
rem
o
te-bzr: add suppo
r
t
fo
r
s
h
ared
r
epo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contrera
s
re
m
ote
-
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
Cont
r
eras
remote-bzr: add supp
o
rt for
b
zr rep
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remot
e
-bzr: use branch
v
a
r
i
a
ble
when app
r
opria
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrera
s
remo
t
e
-bzr: fix
p
arti
a
lly push
e
d merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
rem
o
te-bzr: fixes fo
r
b
r
anch diverge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Contreras
remote-
b
z
r: add
s
u
pport to push
merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe Contre
r
a
s
r
e
mote-
b
zr:
alw
a
ys try to update the worktre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Co
n
treras
remote-bzr: fix or
d
er of locking in CustomT
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote
-
bzr: dela
y
b
l
ob fetching until
t
he very end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-bzr: clea
n
up Custom
T
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-30
Thomas Rast
unpack_en
t
ry: av
o
i
d freeing objects
i
n base
cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ram
k
umar Ramachandr
a
git-completion
.
bash: add
remote
.
pushdefault to config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ram
a
ch
a
ndr
a
git-complet
i
on
.
bash: add bran
c
h
.
*
.
pushre
m
ot
e
to config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Junio
C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2013-04-29
Junio
C
Hamano
Merge
b
r
anch '
f
c/zsh-co
m
pletion' into maint
commit
|
commitdiff
|
tree
2013-04-29
F
e
lipe Cont
r
eras
complete: zsh: use
z
s
h
co
m
p
l
eti
o
n for the main cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contreras
compl
e
te: zsh: trivi
a
l simp
l
ification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
a
mkum
a
r Ramachandra
git-com
p
l
etion
.
bash: complete b
r
anch
.
*
.
re
b
a
se a
s
b
oolean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramach
a
ndra
git-completion
.
ba
s
h
: a
d
d
diff
.
submodule to config list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkum
a
r
R
amac
h
andra
git-completion
.
bash: lexical sor
t
ing for diff
.
statGr
a
ph
W
i
d
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merijn Bran
d
G
i
t
.
p
m
:
c
all temp
f
ile from
File::Temp as a regular
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Ju
n
io C Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2013-04-28
F
e
lipe Cont
r
eras
documentation
:
trivial whitesp
a
ce
cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
John
K
ee
p
ing
t/Makefile:
remo
v
e smok
e
tes
t
targets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Mer
g
e branch 'nd/pretty-formats'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
pretty: Fix
bug in tr
u
nca
t
ion supp
o
r
t f
o
r %>, %< and %><
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next