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
Merge branch 'rb/maint-python-path'
2010-04-03
Juni
o
C Ham
a
no
Merge bran
c
h 'rb/maint-python-path'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
erge branch '
j
n
/
merge-
d
iff3
-
label'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
M
e
r
g
e
branch '
e
f/c
h
err
y
-abbre
v
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
Merge branch 'bw/template-tool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Merge br
a
nch 'mg/mailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'bc/t5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hama
n
o
Merge bra
n
ch 'gh/m
a
int-stash-show-error-messa
g
e
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C H
a
ma
n
o
Merge bran
c
h
'rs/threaded
-
g
r
ep-context'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
Mer
g
e branch 'bc
/
maint
-
daemon-s
a
ns
-
ss-
f
ami
l
y'
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C
Hamano
Merge bran
c
h 'bc/acl-test'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ham
a
no
Merge branch '
j
a/send-ema
i
l-ehlo'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
Mer
g
e branch
'do/rebas
e
-i-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
ma
n
o
M
erg
e
branch
'
ak/e
v
eryday-git'
commit
|
commitdiff
|
tree
2010-04-03
Jon
a
than Nieder
Makefi
l
e: future
-
proof Cy
g
win
v
e
r
sion check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI T
o
mokazu
Fix
_
XO
P
EN_SOUR
C
E pr
o
blem o
n
DragonFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
M
a
rkus Heidelber
g
bu
i
l
t
in/commit: remove unnecessar
y
va
r
iabl
e
definitio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
builtin/commit
:
fix
duplic
a
te
d
se
n
tence in
a co
m
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raymond
Integrate
v
e
rsion
3
ciabot sc
r
ipts i
n
to
c
on
t
r
ib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
E
r
i
c
Blak
e
Makefile: update defaults for modern Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
Hamano
Sync
with 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
H
a
mano
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
u
nio C Hamano
M
e
r
ge bra
n
c
h 'jc/m
a
in
t
-re
f
s
-
dangl
i
n
g
'
into maint
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Do
c
umentation:
s
h
ow-ref <pattern>s ar
e
optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Link against l
i
biconv on IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Don
'
t redefin
e
htonl a
n
d
n
t
o
h
l
o
n
big-endian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub N
a
rebski
gitweb
:
git
_
g
e
t_project_
c
onfig requires only $git
_
dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
U
pdate
d
t
h
e usage string of g
i
t r
e
set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
Documentation: Clarify support f
o
r sma
r
t HTTP backend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Windows: fix
u
ti
m
e() for
read-on
l
y files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Joh
a
n
nes Sixt
diff:
f
i
x
textconv error zom
b
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
K
e
vin B
a
llard
format-patch
:
Squelch
'fatal: Not a ra
n
ge
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hama
n
o
Update dr
a
f
t relea
s
e
no
t
es t
o
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
Merge branch 'cc/cher
r
y-pick-f
f
'
commit
|
commitdiff
|
tree
2010-03-29
Jun
i
o C Ha
m
a
no
Merge branc
h
'sb/notes-p
a
rs
e
-opt'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Ham
a
no
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Thomas Ra
s
t
r
e
base -i: make post-
r
ewrite work for 'e
d
it'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C H
a
mano
Prepa
r
e for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Hamano
Me
r
ge br
a
nch
'
cp/add-u-pa
t
hspec' into
main
t
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C
H
amano
t9350: fix careless use of
"
cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
dif
f
too
l
: Fix
'
--gui' w
h
en diff
.
guitool is u
n
configured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
v
erre Rabbelier
fast-
e
xp
o
rt: do
n
'
t se
g
fa
u
lt when marks file
ca
n
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
imap-send: suppress w
a
rning ab
o
u
t cle
a
rtext password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Mer
g
e
branch 'j
h
/
m
a
in
t
-
su
b
module-st
a
tus-in-vo
i
d'
commit
|
commitdiff
|
tree
2010-03-24
J
u
n
i
o C Hamano
Merge br
a
n
c
h
'tr/n
o
tes-disp
l
ay'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio
C Hamano
Merg
e
branch 'jl
/
submodule-diff-d
i
rtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge bra
n
ch 'p
b
/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge branch 'jc/m
a
int
-
refs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C
H
amano
Merge branch 'jc/color-attrs' into maint
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
M
e
rge branch 'jk/mai
n
t-add-ignored-dir' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Mer
g
e
b
ra
n
ch 'bg/appl
y
-
f
ix-blank-a
t
-eof'
into mai
n
t
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler Ballance
Correct r
e
ferences
t
o
/
usr/bin
/
p
y
thon
w
hich d
o
es not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mar
k
us
H
eidelberg
Document
a
tion
:
e
x
p
l
ai
n
t
he meaning of "-g" in git-d
e
s
cribe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Sync
w
ith Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
unio C
Hamano
Git
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Merge branch 'maint-
1
.
6
.
6
'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailmap: M
a
p the the firs
t
submissi
o
ns
o
f MJG by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
r
ik Faye-Lun
d
l
s
: remove redundant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Eri
k
Faye-Lund
cherry:
support --abbrev opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gruber
Documentat
i
on/
g
it-clone: Transform
des
c
ription list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
G
rube
r
D
o
c
u
ment
a
tion/urls: Remove spurious exampl
e
ma
r
k
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Docu
m
entation/gitdiffc
o
re: Rem
o
ve
m
isleading d
a
te in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
h
ael J Grube
r
Doc
u
m
e
ntat
i
on/git-reflog
:
Fix formatting o
f
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Niede
r
mer
g
e-re
c
ursive:
a
d
d a label f
o
r ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Ni
e
der
cherry-pick, rev
e
rt: add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Niede
r
r
evert:
c
l
a
rify labe
l
o
n conflict hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
compat: add
mempc
p
y()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n N
i
eder
checkout -m
-
-c
o
nflict=
d
iff3:
add a
l
ab
e
l for
ancest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
merge_trees(): a
d
d
ancesto
r
l
abel parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
merge_file(
)
: add comment explain
i
ng be
h
avior wrt c
o
nflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
chec
k
out
-
-con
f
l
i
ct=diff3:
a
dd a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Ni
e
der
ll_m
e
rge(): add ancestor l
a
bel parameter
for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merg
e
-
f
ile
--
d
i
ff3: add
a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
xdl_
m
erge(): move f
i
le1 and file2 lab
e
ls
t
o xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
x
d
l_merge(
)
: a
d
d
op
t
ional an
c
estor labe
l
to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nied
e
r
tests: d
o
cument cherry-pick be
h
avior in face o
f
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n N
i
eder
tes
t
s
: documen
t
form
a
t of
conflicts from
checkout
-
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
mailm
a
p:
E
ntries f
o
r Alex
B
e
nnée, Deskin Mi
l
ler
,
Vital
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
revert: f
i
x t
i
ny
m
emory leak
i
n cherry-pi
c
k --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Up
d
at
e
d
raft
release notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'jk/maint-a
d
d-
i
gnor
e
d-dir'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C
Haman
o
Merge branch '
m
l/color
-
grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
M
e
rge branch
'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
n
o
M
e
r
g
e
branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge
branc
h
'
fl/askp
a
ss
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'bg/apply-fix-blank-
a
t-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
m
an
o
M
e
rge branch 'bw/union-me
r
ge-refa
c
tor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Update draft
r
elease notes t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Chri
s
tian
C
o
u
der
reba
s
e
-i
:
u
s
e
n
e
w
--ff cherry
-
pick
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gruenb
a
cher
fetch: Fix minor memory
lea
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gruenb
a
cher
fetch: F
u
tu
r
e-proof initia
l
i
zation of a refspec
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
nbacher
fetch: Check
f
or a "^{}" suffi
x
with suff
i
xcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjami
n
C Meyer
Fix a spelling mistake
i
n a git-
p
4 console message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhard
t
Use test_expec
t
_success for tes
t
setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
en Walton
M
o
dern
i
z
e
git calling c
o
nventio
n
s
i
n hook
te
m
p
l
ates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
Make templ
a
tes ho
n
our SHELL_PATH and PERL_PATH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre
Deak
daemon
:
parse_host_a
n
d_por
t
SIGS
E
GV
i
f port is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next