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
GIT 1.6.3-rc4
2009-04-09
J
u
nio C
H
a
m
a
no
Merge branch '
j
s/maint-1
.
6
.
0-exec-path-e
n
v' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ha
m
ano
Merge
branch 'tr/m
a
int-1
.
6
.
1-doc-format-pa
t
ch-
-
root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn
St
e
inbrink
p
rocess_{tree,
b
lob}:
Remove useless xstrdup calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
tes
t
s:
skip p
e
r
l
te
s
ts if NO_
P
ER
L
is defined
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
Makefile: a
l
l
o
w
buil
d
ing without perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Moy
git-p
u
ll
.
sh: better warning message for
"
git
p
u
l
l
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: refactor commands to use git-mer
g
etool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jef
f
K
i
ng
b
r
anch
:
show
u
p
s
tream branch when double ver
b
ose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff
King
make get_short_ref a public
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff
Ki
n
g
for-each-ref: add
"upstr
e
a
m" format fiel
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
f
or-each-ref: refact
o
r
r
e
f
n
ame handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio
C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-08
Junio C
H
ama
n
o
Merge bra
n
ch 'maint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-04-08
J
a
ri Aalto
Change doubl
e
quotes
t
o single qu
o
tes in messag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
u
n
io C Hamano
Merge bra
n
ch 'maint-1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Junio C Haman
o
Merg
e
branch 'lt/reflog-ex
p
i
r
e'
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o
C
Ham
a
no
Me
r
ge branch '
b
s/maint-1
.
6
.
0-tree-walk-pre
f
ix'
commit
|
commitdiff
|
tree
2009-04-08
Junio
C
Ha
m
ano
Merg
e
b
ranch 'ms/http-auth'
commit
|
commitdiff
|
tree
2009-04-08
Juni
o
C Hamano
Merge branch 'js/m
a
int-submod
u
le-che
c
kout'
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o
C Hamano
Merge branch 'cb
/
maint-merge-
r
ec
u
r
sive-su
b
module-fix'
commit
|
commitdiff
|
tree
2009-04-08
J
u
nio C Hamano
Merge branch 'mh/
h
tml-path'
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
A
guila
r
merget
o
ol: use $(
.
.
.
) inste
a
d of `b
a
ckticks`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
bash compl
e
tion:
a
dd gi
t
-difftool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
d
ifftool: add support
f
or a di
f
ftool
.
promp
t
config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd various git-diff
t
ool tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difft
o
ol:
move 'git-diff
t
ool' out of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian
P
i
pping
difftool/merget
o
ol: add d
i
ffu
s
e
as merge and di
f
f tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
o
o
l: add a -y s
h
ortcut
f
or --n
o
-prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool
:
use perl built-i
n
s when te
s
ti
n
g for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
d
i
fftool: r
e
move the backup file f
e
atur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
tool: remove merge options for op
e
n
d
iff
,
t
k
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s
H
ei
d
elberg
g
it-me
r
getool: add new merge tool Tortoise
M
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidel
b
erg
g
i
t
-
m
ergetoo
l
/
diffto
o
l: make
(
g)vimdiff workable under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s Heid
e
lb
e
rg
doc/
m
e
rge-c
o
n
f
ig: l
i
st ecm
e
r
ge as a built-in me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christ
i
an Co
u
der
rev-list: add "i
n
t bisec
t
_show_flags" in
"
s
t
ruct rev_
l
ist_i
n
fo"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christian Couder
r
ev-
l
ist: remove last static vars used in "show_commit
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christian Couder
list-objects
:
add "void *
d
ata" parameter
t
o show
f
unc
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Mo
y
git
-
rev-list
.
txt:
m
a
ke ascii
markup uniform with ot
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-send-e
m
ail
.
txt: clarify which options tak
e
an argument
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-each-ref: refactor get_short_ref function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sant
i
Béj
a
r
D
ocum
e
ntation: Introduce "upstream branch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jason Merrill
D
ocu
m
en
t
a
ti
o
n
: clarify
.
g
i
tatt
r
ibutes
s
earch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
t
hieu Moy
gi
t
-ch
e
ckout
.
txt: clarify that <
b
ran
c
h> app
l
ies when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
thieu Moy
git-checkout
.
txt:
fix inc
o
rre
c
t statemen
t
about HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn Arne Gang
s
tad
git remote upd
a
te: Fallbac
k
to remote if gro
u
p does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn Arne Gangs
t
ad
remote: New functio
n
remot
e
_is_c
o
nfigured()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn
Arne Gangsta
d
git remote u
p
date:
R
eport error
f
or non-existing
g
r
oups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
sha1-lookup: fix up
t
he a
s
s
er
t
ion
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
i
o
C
Hamano
Merge branch 'jc
/
name-branc
h
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C
Hamano
Merge
branch 'jc/shared-literally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C H
a
ma
n
o
Mer
g
e
branch 'mg/track
e
d-l
o
cal-branches'
commit
|
commitdiff
|
tree
2009-04-06
J
unio C Hamano
Merge bran
c
h 's
b
/fo
r
mat-patch-patc
h
nam
e
'
commit
|
commitdiff
|
tree
2009-04-06
F
elipe Contr
e
r
a
s
u
s
er-
m
anual: the name of the
has
h
fu
n
ction is SHA
-
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contreras
docb
o
ok:
c
h
ange css style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contreras
user-manual: re
m
ove some git-foo usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Documen
t
ation: branc
h
.
*
.
m
e
r
ge can als
o
affect 'g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Hei
k
o Voigt
Add
co
n
fi
g
uration va
r
iabl
e
for
s
ign
-
off t
o
format-pat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Tod
d
Zullinger
bash
c
ompletion: Update 'git am' op
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Finn Ar
n
e
Gang
s
ta
d
g
i
t rem
o
te update
:
New optio
n
--prune
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Finn Arne
G
a
ngst
a
d
builtin-remote
.
c: Split out
p
r
une_remote a
s
a sepa
r
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bis
e
ct--hel
p
er:
string
o
utput
v
a
r
iables together
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christi
a
n Couder
rev-list: pass "int
f
lags" as last
a
rgument o
f
"s
h
ow_bisect_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
h
rist
i
an Coude
r
t6030:
test bisecti
n
g with pa
t
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Chri
s
tian Couder
bi
s
ec
t
: use "bisect--helper" and re
m
ove "filter_skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect: implement "r
e
ad_bi
s
ect
_
p
aths" to r
e
ad
paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Coude
r
bisect--helper: i
m
p
l
ement "git bisect--helpe
r
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian
Couder
bisect:
use the ne
w
generic "sha1_pos" function to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian C
o
uder
rev-l
i
st: call new "f
i
lter_ski
p
"
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C H
a
m
a
no
Me
r
ge
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2009-04-05
Julie
n
Danj
o
u
git sub
m
odule
:
fix us
a
g
e
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
uni
o
C Hama
n
o
Merge branch 'maint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
ano
Merge
b
r
anc
h
'maint-1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
M
arkus Heidelberg
doc/git
-
pack-refs: fix
two grammar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests:
r
emove
e
x
i
t
after test_done
call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ff K
i
ng
commit: abo
r
t comm
i
t if intera
c
tiv
e
add fa
i
led
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
l
e
m
e
n
s
Buchacher
simp
l
i
fy
output o
f
confl
i
cting merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bu
c
hacher
upda
t
e cache for co
n
f
l
icting s
u
bmod
u
le entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bucha
c
her
add
t
e
s
ts for
mer
g
ing with submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ch
r
i
st
i
an Couder
bisect: improve err
o
r message wh
e
n branch checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan McG
e
e
git-rep
a
ck: use non-dashe
d
u
pdate-server-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
M
arkus
Hei
d
e
l
berg
add --html-path to get the locati
o
n of install
e
d HTML
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
M
erge b
r
a
nch '
c
c/sha1-bsearch' into HE
A
D
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
pa
t
c
h
-ids: use the
new generic "
s
ha1_pos" functio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
s
h
a1-lookup: add new "s
h
a
1
_pos" fu
n
ction to
e
ffic
i
ently
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffia
n
send-email
:
fix nasty
b
ug in
ask()
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hama
n
o
Update draf
t
release notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Joh
a
n
nes Schind
e
lin
Fix
'
git checkou
t
<submodule>' to update the i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Mart
i
n St
o
rsjö
All
o
w curl
t
o rew
i
nd the read buffer
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
S
ync
w
i
t
h 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nch 'jc/m
a
int-
1
.
6
.
0-bla
m
e-s' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Mer
g
e
b
r
anch 'js/maint-diff-temp-sm
u
dge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
bra
n
ch 'js/maint-1
.
6
.
0-exec-path-
e
nv' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Merge branch
'
bc
/
maint-1
.
6
.
1-
b
ranc
h
-
d
elete
d
-was
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge b
r
anch 'tr/maint-1
.
6
.
1-doc-fo
r
mat-patch-
-
root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ham
a
no
Merge b
r
an
c
h 'dm/m
a
in
t
-
d
occo' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ia
n
send-email: ensure quoted addresses are rfc2047 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
se
n
d-ema
i
l:
correct two test
s
which w
e
re going interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge br
a
nch 'ef/fa
s
t
-
e
xpor
t
'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
H
am
a
n
o
Me
r
ge branch 'm
h
/forma
t
-p
a
tch-ad
d
-he
a
der'
commit
|
commitdiff
|
tree
next