repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/merge-diff3-label'
2010-04-03
Junio C Hamano
Merge bra
n
ch
'
jn/mer
g
e-d
i
ff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hama
n
o
Merge branch '
e
f/c
h
erry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio
C
Hamano
Merge
b
ranch
'
bw/template-tool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
J
u
ni
o
C Hamano
Merge bran
c
h 'mg/mailmap-update
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C H
a
mano
Merge branch 'bc/t
5
5
05-fix
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge bra
n
c
h 'gh/maint-stash-s
h
ow-
e
rror-m
e
ssage'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
i
o
C Ham
a
no
Me
r
ge
b
ranch 'rs/thre
a
ded-
g
rep-context'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge branch 'bc/maint-daem
o
n-sa
n
s
-ss-fami
l
y'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
branch '
b
c/acl-test'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio
C Hamano
Merge branch 'ja/s
e
nd-e
m
ail
-
ehl
o
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge
branch 'do/rebas
e
-
i
-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merg
e
branch
'
ak/everyday-git'
commit
|
commitdiff
|
tree
2010-04-03
Jona
t
han Niede
r
Ma
k
efile: fut
u
re-proof C
y
gwin
v
ersion check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YO
N
ETANI Tomoka
z
u
Fix _XOPEN_SOURCE problem on Drago
n
Fly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heide
l
berg
bu
i
ltin/commit: r
e
m
ove unnecessary va
r
iable definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Marku
s
Heidelberg
bu
i
ltin/com
m
it:
fix dupli
c
ated sentence
i
n a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric
R
aymond
I
ntegrate version
3
c
iabot scr
i
pts into contrib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eri
c
Blake
M
akefile:
u
pdat
e
de
f
aults for modern
Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
H
am
a
no
S
ync with 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
Haman
o
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Hamano
M
erge branch 'jc/maint
-
refs-dangling' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
D
o
cumentation:
show-ref <patter
n
>s are optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Link against libiconv
on IRIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
Don
'
t redefine
h
tonl
a
n
d
n
to
h
l on big-endian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
J
a
kub
N
arebski
gitweb
:
git
_
g
et
_
project_
c
onfig requires onl
y
$g
i
t
_
d
i
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan
Stępień
Updated the usage string of git reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Gr
e
g Bacon
Do
c
u
m
entati
o
n: Clarify su
p
port f
o
r
smart HTTP ba
c
kend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Wind
o
ws: fix utime() for read
-
o
n
ly files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
J
ohann
e
s Sixt
di
f
f:
f
ix t
e
xtconv e
r
ror
z
ombies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ballard
format-patch:
S
q
uelc
h
'fatal:
N
ot a range
.
" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Haman
o
Up
d
ate d
r
aft
r
elease n
o
tes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Me
r
g
e
branch 'cc/cherry-pic
k
-f
f
'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
Merg
e
b
r
anch '
s
b/no
t
e
s-parse-
o
pt'
commit
|
commitdiff
|
tree
2010-03-29
J
u
n
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Thom
a
s Rast
rebase -i: mak
e
p
os
t
-rewri
t
e
work for 'e
d
it'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Prepare
for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
Merge branch 'cp/add-u-pathspec' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merg
e
bra
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
a
m
a
no
t93
5
0:
f
ix carele
s
s
us
e
of "c
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '-
-
gui
'
when
diff
.
guitool is
u
ncon
f
igured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sv
e
r
re Rabbelier
fas
t
-expor
t
: d
o
n't segfault when m
a
r
k
s file ca
n
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
ima
p
-sen
d
:
suppres
s
w
a
rning about clea
r
text p
a
ssword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge branc
h
'
jh/maint-submodule
-
status-in-void
'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
H
a
mano
Merge br
a
nch 'tr/notes-dis
p
l
a
y'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Merge branch
'jl/su
b
m
o
dule-diff-dirt
i
n
ess'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Ham
a
no
Merg
e
branch 'pb/log-first-parent
-
p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Mer
g
e branch 'jc/maint-refs-dan
g
lin
g
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io
C
H
amano
M
e
r
ge branch 'jc
/
colo
r
-attrs
'
i
nto
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
aman
o
Merg
e
branch 'jk/maint
-
add-ignored-dir' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
Merge branch 'bg/apply-fix-blank-at-
e
of' into maint
commit
|
commitdiff
|
tree
2010-03-24
M
a
rku
s
Heid
e
lberg
Document
a
t
i
on:
e
xplain the
meani
n
g
o
f "-g" in
git-describ
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
J
unio C H
a
mano
Sync wit
h
Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Juni
o
C Hamano
Gi
t
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hama
n
o
M
erge branch 'maint-1
.
6
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
h
ael
J G
r
uber
.
mailmap: Ma
p
t
he the first submi
s
s
i
ons
o
f MJG
b
y e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fay
e
-Lund
ls: re
m
o
ve re
d
undan
t
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik
F
aye-Lund
c
herry:
s
upp
o
rt --abbrev option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation
/
git-clone: Transform
d
es
c
ription list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J Gru
b
er
Doc
u
me
n
tation/url
s
: R
e
move sp
u
riou
s
example markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation
/
gitdiffcore: Rem
o
v
e
misleading date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/git-r
e
f
log:
F
i
x
f
o
r
m
atting
of co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
merge-recursiv
e
: a
d
d a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry
-
pick, revert: add a labe
l
f
o
r a
n
cesto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Ni
e
der
revert: clarify
l
a
bel on co
n
flict hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
ed
e
r
comp
a
t: add mempcpy
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
d
e
r
ch
e
ckout -m --conflict=diff3
:
add
a
label for
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nied
e
r
m
e
r
g
e_
t
r
e
es(): a
d
d ancestor label
parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merge_fil
e
(): add comm
e
nt e
x
pl
a
in
i
n
g
behavior wrt co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
an Nieder
checkou
t
--conflict=diff3: add a
label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an N
i
eder
ll_merge(): ad
d
ancestor label parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge
-
file
--diff3: add a
l
abel for anc
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an Nieder
x
d
l_
m
e
r
ge(
)
: move f
i
le1 and file2 labels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
eder
xdl
_
merge(): add o
p
tional ancesto
r
label to diff3-sty
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: doc
u
ment cher
r
y-pick behavior in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
te
s
ts:
d
ocum
e
nt format of conflicts f
r
om ch
e
ckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J Gruber
.
m
ailmap: E
n
tries for Alex Bennée
,
Deskin Miller, Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: fix tiny memory leak in cherry-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Haman
o
Up
d
ate draft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C
Hamano
Merge branc
h
'jk/main
t
-add-ignore
d
-dir'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
Hamano
Merge branch
'ml/
c
olor-grep'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Merge branch 'jc
/
color-
a
ttrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge
b
r
a
n
c
h 'cc/reset-kee
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'fl/askpa
s
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Haman
o
Merge branch '
b
g/a
p
ply-fi
x
-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
m
an
o
M
e
rge branch 'bw/union-merg
e
-refacto
r
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge b
r
anch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C H
a
mano
Update draft release not
e
s to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
C
h
risti
a
n Coud
e
r
reba
s
e
-i
:
use n
e
w
--ff
c
herr
y
-pick
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch: Fix
m
inor
memory
l
eak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas Gruenbac
h
er
fetch: Future-proof in
i
tialization of
a refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenba
c
he
r
f
e
tch: Che
c
k fo
r
a "^{}" suffix with suff
i
xcmp(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
njamin C Meyer
Fix a spelling mist
a
ke in a git-p4 co
n
sole message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian G
e
r
n
h
ar
d
t
Use test_expect_succ
e
s
s
f
o
r test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
en Walton
Moderni
z
e
g
it calling conventi
o
ns in hook
t
emplates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben Wal
t
on
Make
temp
l
ates honour S
H
ELL_PATH and
PERL_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre
D
eak
daemon: parse_host_and_port SIGSEGV
i
f port is sp
e
cif
i
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonatha
n
Niede
r
Makefile:
Fix oc
c
asional GIT
-
CFLAGS breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nieder
Makef
i
le: F
i
x
C
D
PATH
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next