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
add tests for merge-index / merge-one-file
2011-04-29
Jeff King
add
t
ests fo
r
merge-index / merge
-
one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonatha
n
Ni
e
der
fas
t
-import: introduce "feature notes" comm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fast-import:
c
larify d
o
cumentat
i
o
n
of "feature" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-10
Thomas Rast
D
o
cum
e
nt
a
tion
/
git-archive: spell --worktree-attributes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-15
Junio
C
Hamano
Git 1
.
7
.
0
.
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-15
Junio C Hamano
Git 1
.
6
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-15
Junio C Hamano
Git 1
.
6
.
5
.
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-15
Junio C
H
aman
o
Git 1
.
6
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-15
Jaku
b
Nar
e
b
s
ki
gitweb:
In
t
roduce
e
sc
_
a
t
tr to escape
a
ttributes of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-02
Ju
n
io C
Hamano
Git 1
.
7
.
0
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-01
Jonathan
N
ieder
add: introduce add
.
ignoree
r
ror
s
synon
y
m for add
.
ignore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
u
nio C
H
a
mano
G
i
t
1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Niede
r
config --get --path: check for unset $HOME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Hamano
Me
r
ge
bra
n
ch 'maint-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Hamano
Mer
g
e branch 'm
a
int-1
.
6
.
5
'
into main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
St
e
phen
B
oyd
request-pull
.
tx
t
: Document
-
p
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockm
a
n
Check size of path b
u
ffer before
w
riting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine
-
Kö
n
i
g
rev
-
parse: f
i
x -
-
p
a
rse-opt --keep-da
s
hda
s
h --stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-29
Michael J Gruber
Do
c
ume
n
tation/
c
onfig: d
e
s
c
ribe status
.
submodulesummary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-28
Micha
e
l J Gruber
M
akef
i
le: reena
b
le
install with NO_
C
U
RL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-04
René Scharfe
re
m
ove e
c
b par
a
m
e
ter from xdi_di
f
f_outf()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-01
M
i
chael J
G
ruber
index-pack: fi
x
trivial typo in u
s
age st
r
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-01
G
errit
P
ape
git-submodu
l
e
.
sh: properly i
n
i
t
ialize sh
e
ll variable
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Eric Raymond
Documentation impr
o
v
e
ment
s
for the descript
i
on of
short
.
.
.
the bug noted by
Junio C Hamano
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C
H
amano
Merge branch 'mg
/
u
s
e-default-abb
r
ev-length-in-re
v
-
list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
J
unio
C
Hama
n
o
M
erg
e
branch 'wp
/
d
oc-filter-dir
e
ction' into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Junio C Ham
a
no
Merg
e
bran
c
h 'jk/maint-di
f
fstat-overflow' into maint
commit
|
commitdiff
|
tree
2010-04-23
Ju
n
i
o
C
Hamano
Merge branc
h
'da/maint-python-
s
tartu
p
' into m
a
int
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Ni
e
der
Documentation/M
a
k
e
fi
l
e: fix interrupt
e
d
b
uilds of us
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
Mic
h
ael J Gr
u
ber
t7012: Mar
k
miss
i
ng t
e
sts as T
O
D
O
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gábor
r
e
flog: remove 'show' fr
o
m '
e
xpire's
us
a
ge
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio
C
H
amano
M
erge bran
c
h '
m
aint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-04-19
Johannes Sixt
MSVC: Fix bu
i
l
d by adding
m
i
ssing termios
.
h d
u
mmy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentatio
n
:
D
e
sc
r
ibe other situatio
n
s
wh
e
r
e
-z affe
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Will
P
a
l
mer
documentation:
c
larify
d
irection of core
.
autocrlf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jeff
King
diff: use l
a
rge in
t
e
g
ers for diffstat calculations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Mich
a
el J Gru
b
er
t
1010-
m
kt
r
ee: Ad
j
ust expected result t
o
cod
e
and documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
T
homas
R
ast
combine
d
diff:
correctly handle trunca
t
ed fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document new "alread
y
-merged" rule for branch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
J
ay Soffian
Docume
n
tati
o
n/config
.
tx
t
:
d
efa
u
lt gc
.
a
gg
r
essiveWindow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
Marc Branchaud
Docs: Add -
X
option
to
g
it-merge's synopsis
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
J
u
nio C Ha
m
ano
G
i
t 1
.
7
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C H
a
mano
Merge branch 'rc/maint
-
reflo
g
-msg-for-f
o
rce
d
-branc
h
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C Hamano
blame d
o
c
u
ment
a
tio
n
: -M/-C not
i
ce copied l
i
n
e
s as
w
ell
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehm
a
nn
Let chec
k
_preimage() use mem
s
e
t() t
o
i
n
i
tiali
z
e "str
u
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Mer
g
e branch 'ef/maint-empty-commit-log' into maint
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Merge
b
ranch 'jc/conflict-mar
k
er-size'
i
nto maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
erg
e
branch 'sp/ma
i
nt-h
t
tp-
b
acken
d
-die-triggers-di
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o
C
Hamano
Merge branch 'm
g
/ma
i
nt-send-
e
mail-lazy-editor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
Me
r
g
e br
a
n
c
h 'rr/
i
m
a
p-send-unconfuse-from-line' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'rb/
m
aint-pytho
n
-
path
'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
Merge br
a
n
ch '
g
h/maint-stash-show-error-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
ama
n
o
Merge branch 'mg/mailmap-u
p
date' into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
am
a
n
o
Merge branch 'bc/maint
-
d
a
emon
-
sans-ss-family'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
T
ay Ray
Chuan
fetch
/
push: fix usage string
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Tay R
a
y
Chuan
branc
h
: s
a
y "Reset to"
in reflog entries for
'git
bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-08
Jeff
K
i
n
g
docs:
clarif
y
"br
a
n
c
h -l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray
C
hu
a
n
pa
c
k-protocol
.
txt: fix pkt-line lengths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chu
a
n
pack-proto
c
ol
.
txt: fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C
Hamano
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jun
i
o C
H
aman
o
Merge branch 'jc/maint
-
refs-dangling'
i
n
to
main
t
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Documentatio
n
:
s
h
o
w-r
e
f
<patte
r
n>s are optiona
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger We
i
ß
Link a
g
a
i
nst
l
ibiconv on IRIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Don'
t
redefine htonl a
n
d nto
h
l
o
n big-endian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
J
akub Narebski
gitwe
b
:
git
_
get_
p
roj
e
ct_config requi
r
es only $
g
it_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stę
p
ień
Updated the
u
sage st
r
ing of g
i
t reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Gre
g
Bacon
Do
c
umentat
i
on: Clarify
s
uppo
r
t for
smart HTTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Win
d
o
ws: fix utime
(
) for
r
e
ad-only files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
diff:
f
ix text
c
onv erro
r
zombi
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ballard
format-p
a
tch: Sque
l
ch 'fatal: No
t
a
r
a
nge
.
" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Mak
e
f
i
le: Re
m
ove usage
of d
e
p
r
ecated
Py
t
hon
"has_key
.
.
.
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 Hamano
Merge branch 'cp
/
add-u-pathspec' int
o
mai
n
t
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
t
9350: fix c
a
re
l
e
s
s use of "cd"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--
g
ui'
when diff
.
guit
o
ol is u
n
configured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sverr
e
Rabbeli
e
r
fast-exp
o
r
t
: do
n
't segfault when mar
k
s
fi
l
e cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Gr
u
ber
send-email
:
l
azily assign
editor variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Junio C
H
aman
o
diff -
-
check: honor conflic
t
-
marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C Ha
m
an
o
Merge br
a
n
c
h
'jc/col
o
r-attrs' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge
b
ranch 'jk/maint
-
add
-
ignored-dir' into m
a
int
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merg
e
branch 'b
g
/
ap
p
ly-f
i
x-bla
n
k
-
a
t-eof'
i
nto
ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-24
S
h
awn O
.
Pearce
http-back
e
nd: Don
'
t
infinite loop during die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler
B
allance
C
o
rrect references to
/
usr/b
i
n/python w
h
ich does no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ma
r
kus Heidelberg
Do
c
umenta
t
i
o
n: explain
the mean
i
ng of "-g" in
g
it-describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Michael J
Gruber
re
v
-list:
u
se default ab
b
rev le
n
gth when ab
b
rev
-
commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
a
m
ku
m
ar Ramach
a
ndra
imap-
s
e
n
d: Remove limitation on m
e
ssage body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hama
n
o
Gi
t
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Ju
n
io C Hamano
M
e
rg
e
branch 'ma
i
n
t
-1
.
6
.
6'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailmap: Map
t
he the first submissions of
MJG
b
y e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
ruber
Documentation
/
git
-
c
l
o
ne:
T
ra
n
s
f
o
rm descripti
o
n list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J Gruber
Documen
t
a
tion/urls: Remove spurious example mark
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
Documentation/gitd
i
ffcore:
R
emove m
i
sleading date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
D
o
c
u
menta
t
ion/git
-
reflog:
Fi
x
f
ormat
t
ing of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
ye-
L
u
n
d
rev-list:
f
ix
-
-
pretty=on
e
line with empty message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
m
ailma
p
: Entri
e
s for Alex Bennée, Deskin M
i
lle
r
, V
i
taly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Update
draf
t
r
e
lease
n
otes to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
ndrea
s
Gruenba
c
h
er
fetch: Fix minor m
e
m
ory lea
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruen
b
a
c
he
r
f
etch: Future-proof
initialization of a
refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next