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
user-manual: Document that "git merge" doesn't like uncommited changes.
2009-11-23
Matthieu
M
oy
user-manual: Docu
m
en
t
t
hat "git merge" doesn
'
t
l
i
k
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
t
h
ieu Moy
merge-
r
ecursi
v
e: point t
h
e use
r
to c
o
mmit
w
he
n
fil
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
J
unio C
Hamano
GIT 1
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Simon Arlott
git-svn
:
h
ide find_parent_branch
output in double quiet
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan
Nied
e
r
Documenta
t
ion: clone: clarify discuss
i
on o
f
in
i
tia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
J
u
nio C Hamano
Me
r
g
e b
r
anch '
r
s/maint-ar
c
hive-prefix'
commit
|
commitdiff
|
tree
2009-10-09
Junio C Ham
a
no
Merge branch
'fc/mutt-alias'
commit
|
commitdiff
|
tree
2009-10-09
Junio C
H
am
a
no
Mer
g
e branch 'ef/m
s
v
c
-noreturn'
commit
|
commitdiff
|
tree
2009-10-09
J
u
nio C Hamano
Me
r
ge
branch 'jk/reflog
-
d
ate'
commit
|
commitdiff
|
tree
2009-10-09
Junio C Hamano
Merge br
a
nch 'ch/am-hea
d
er'
commit
|
commitdiff
|
tree
2009-10-09
Björn Gustav
s
son
bash: ad
d
sup
p
ort for 'git replace'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Stephen B
o
yd
completion: fix alias l
i
s
t
in
g
s with newlines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Stephen Boy
d
c
o
m
p
letion: fix completion
of git
<
T
AB><TAB>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ingmar Va
n
has
s
el
impo
r
t
-
t
a
r
s: A
d
d missing closing brack
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
N
iede
r
racy-git
.
txt: explain nsec problem in
m
ore de
t
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jona
t
han Nieder
Documentation: clarif
y
"
working
t
re
e
" defi
n
ition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan N
i
ede
r
D
o
cumentat
i
on: clarify branch creatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentation:
branch
:
up
d
ate --me
r
ged description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
J
onathan Nieder
Documentati
o
n:
c
larify mergeoptions
descr
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
D
o
cumentation: gi
t
fmt-merg
e
-msg does not have to be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jona
t
han Nieder
Describe
D
OCBOOK_XSL_172, ASC
I
I
D
OC_NO_ROFF
options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Jeff King
p
ull: improve advice for
u
nconfig
u
red error c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Junio C Ha
m
ano
Me
r
ge
git:
/
/git
.
bogomips
.
org
/
git-s
v
n
commit
|
commitdiff
|
tree
2009-10-09
Junio
C
Ham
a
n
o
M
er
g
e branch 'ms/msvc
'
commit
|
commitdiff
|
tree
2009-10-09
Junio C H
a
mano
U
p
da
t
e
draft release notes to 1
.
6
.
5
commit
|
commitdiff
|
tree
2009-10-09
Junio
C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2009-10-09
Bran
d
on Casey
Makefile: add
a
note
a
bout the NO_MMAP setting o
n
I
RIX
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ben Walton
ls-file
s
: die
instead of
f
print
f
/exit
i
n -i error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Brand
o
n Casey
Mak
e
file: enable THREADE
D
_
DELTA_SEAR
C
H on
I
R
IX an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
Ramsay Jones
Fix the
exit code of MSVC build scri
p
t
s on c
y
g
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
R
a
msay Jones
Fix
MSVC build on cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-09
René Sc
h
arfe
Git a
r
chive and
t
rai
l
ing
"/" i
n
prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Stephen
B
oyd
c
o
mpletio
n
: add dirsta
t
and
f
r
i
ends to diff opti
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
Steph
e
n
Boyd
completion: update am
,
commit, and
log
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
B
r
ando
n
Ca
s
ey
M
ak
e
file
:
ena
b
le THR
E
AD
E
D_DELTA_SEARCH on SunOS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-08
J
un
i
o C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-10-07
Jun
i
o
C
Hamano
fast-
i
mport
.
c::va
l
idate_raw_date(): really validate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-07
Stefan N
a
ew
e
README: git lives at http:
/
/git-scm
.
com
t
h
ese da
y
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-05
Jun
i
o
C Ha
m
a
no
git-pull: dead
code r
e
mo
v
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-10-04
Junio C Ha
m
a
n
o
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2009-10-04
Junio C Hamano
Merge branch 'jc/
m
aint-1
.
6
.
4-show-br
a
n
ch-def
a
ult' into
.
.
.
commit
|
commitdiff
|
tree
2009-10-04
Junio C Hamano
s
h
o
w-br
a
nch: f
i
x segfault
w
hen sho
w
branch
.
d
e
fa
u
l
t
exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-23
J
unio C Hamano
pu
l
l: Cl
a
ri
f
y
"helpfu
l
" messag
e
for another corne
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-23
T
hiago Farina
Update
"
describe" documentation to
match reality
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
SZE
D
ER
Gábor
bash:
t
e
ach 'git reset --patc
h
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
SZEDER Gábo
r
b
ash
:
up
d
at
e
'git stash' c
o
mple
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
SZEDER Gábor
bash: rena
m
e __git_find_subcomman
d
() to
_
_git_find_on_
c
mdline()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
J
unio C
Hamano
pay att
e
nti
o
n to
DESTDIR
when bui
l
ding with N
O
_PE
R
L_MAKEMAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
Jim Meyeri
n
g
pre-commit
.
samp
l
e:
a
dd comment r
e
t
r
portability
;
fi
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-22
Junio C
H
am
a
no
Upda
t
e Release No
t
es to 1
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-21
Joh
a
nnes Sixt
test-g
e
nrandom:
e
n
s
ure
stdo
u
t is set to
_
O_
B
INAR
Y
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-21
Junio
C Ha
m
ano
M
erge git://
g
i
t
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2009-09-20
Junio C Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-09-20
M
a
tthieu Moy
pu
s
h: Corre
c
tly ini
t
ialize nonfastforward in
tr
a
nsport_pus
h
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
arius
S
torm-Olsen
Tag
GIT_VERSION
w
he
n
G
i
t
is bui
l
t wi
t
h MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius
S
torm-Olsen
Add
s
cript
s
to
g
e
nera
t
e projects for
o
ther buildsys
t
ems
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius Sto
r
m-Ol
s
en
Add READ
M
E for MSVC bu
i
ld
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
a
rius St
o
rm-Olsen
Ad
d
MSVC t
o
M
akefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olsen
Define strncasecmp and
ftrun
c
ate for MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius St
o
rm-Olsen
Make usage
of win
d
ow
s
.
h lean and mean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Fr
a
nk Li
Add platform files f
o
r p
o
r
t
ing to MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Ad
d
MinGW header file
s
to
buil
d
git with MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olse
n
A
d
d
empty header
files
for M
S
V
C
por
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Test f
o
r WIN3
2
instead of __MINGW32_
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
F
ix __st
d
call pl
a
c
e
me
n
t an
d
function prot
o
type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Marius
St
o
rm
-
Olsen
S
e
t _O_BINARY
as default
f
m
o
de
fo
r
both MinGW and MSVC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank
L
i
C
hange regerror() decl
a
rat
i
on from K&R style to AN
S
I
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
M
a
r
iu
s
Stor
m
-Olsen
Add
i
n
cl
u
de guards t
o
compat/win32
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Frank
L
i
Avo
i
d decl
a
r
a
t
io
n
af
t
er s
t
at
e
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Th
i
ago Farina
pack-objec
t
s: rem
o
v
e
SP at
the
e
nd
of usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-19
Thiag
o
Farina
U
pdate th
e
usag
e
bu
n
d
l
e
s
trin
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-17
Clemens
Buc
h
acher
cvs: initialize
empty p
a
ssword
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
J
u
ni
o
C
Hamano
Merge 1
.
6
.
4
.
4 i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
Junio
C Hamano
GI
T
1
.
6
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-16
Ju
n
io
C Haman
o
Merge bra
n
ch
'jc/mai
n
t-un
p
ack-obje
c
ts-strict' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Jun
i
o C
Hamano
Merg
e
branch 'tf
/
diff-white
s
pace-in
c
omp
l
ete-line' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Junio C Ha
m
an
o
M
erge b
r
anch 'jk/
m
aint-1
.
6
.
3-checkout-unborn' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
J
u
nio C Hamano
Mer
g
e branch 'jc/maint-checkout-index
-
to-pref
i
x' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Junio C Hamano
M
e
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-09-14
Junio C
Hamano
Merge bra
n
ch
'rc/
m
aint
-
http-no-head-
p
ack-check'
into
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Junio C Hamano
http
.
c: avoid
freeing an unin
i
tializ
e
d
pointer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
Heiko Voigt
web--brows
e
: fix
Mac OS X GUI detection for 1
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
H
e
iko
V
o
ig
t
remove logical ty
p
o
in documentat
i
o
n of
samp
l
e
u
pdat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-14
Nicolas
Pitre
Nicolas
P
itre has a new email address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Dmitry Potapov
g
it-archive: infer output format from filename when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Todd
Zulli
n
ger
comp
l
eti
o
n: Re
p
l
a
ce conf
i
g --list with --get-regexp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Dm
i
try
P
otapov
git-archive:
a
d
d
'
-
o' as a alias for '--output
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
C
lemens
Bu
c
hac
h
er
test lo
c
al c
l
on
e
b
y
c
o
p
ying
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Johannes
G
il
g
er
git-cl
o
ne doc: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Nelso
n
Elha
g
e
g
i
t-push:
A
ccept -n as a
s
ynonym for --d
r
y-run
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Junio
C H
a
m
a
no
git-
c
ommit d
o
c: remove duplicated --dr
y
-run des
c
ription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
J
u
n
io C Ham
a
no
GIT 1
.
6
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Jar
i
Aa
l
to
Improve --patch option do
c
ume
n
tation in git
-
add
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
Junio
C Hamano
Merge
branch 'pk/fast-import-tars'
commit
|
commitdiff
|
tree
2009-09-13
Juni
o
C Hamano
Merg
e
branch '
p
k/fast-
i
mpo
r
t-
d
i
rs'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hama
n
o
Me
r
ge br
a
nc
h
'jt/p
u
shinsteadof'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hamano
M
e
r
ge branch 'jk/unwante
d
-
advices'
commit
|
commitdiff
|
tree
2009-09-13
Junio C H
a
mano
Merge
b
ranch 'jc/merge-saner-mes
s
ages'
commit
|
commitdiff
|
tree
2009-09-13
Junio
C
Ha
m
a
no
quiltimport documentation: --dry-
r
u
n
an
d
-n are synonyms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-09-13
C
l
emens
B
uchacher
preser
v
e mtime of local
c
l
one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next