repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a test for git-rerere
2006-12-22
Johannes
Sch
i
nd
e
l
in
Add a t
e
st for git-rerere
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes
Schindelin
move read_mmfile() into xdiff-i
n
ter
f
ace
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pear
c
e
Introduce a
globa
l
lev
e
l warn() function
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
h
a
wn O
.
Pearce
Rename imap-
s
e
n
d's inter
n
a
l
info/
w
arn fun
c
tions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
amano
_XOPEN_S
O
URCE pr
o
ble
m
a
lso
exists
o
n F
r
ee
B
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Juni
o
C Hamano
p
arse-re
m
ote: mark
a
ll refs n
o
t for mer
g
e
only
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C
H
amano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schi
n
deli
n
git-reset --hard: te
l
l the user
w
hat the HEAD was reset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sch
i
ndelin
git-tag:
support -F <file> optio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
ama
n
o
Rever
t
"gi
t
-pull: refuse defa
u
lt
m
erge without branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
S
h
a
wn O
.
Pearce
Suggest
'
add
'
in
a
m/revert/
c
h
er
r
y-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
e
s Schindelin
Use git-m
e
rg
e
-fil
e
in git-merg
e
-on
e
-file, t
o
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Schindelin
di
f
f --check: fix off by one error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Qu
y
Tonthat
D
ocum
e
ntation/g
i
t-branc
h
: n
e
w -r
to
delete
r
emot
e
-tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
T
erje St
e
n B
j
er
k
set
h
Fix s
y
ste
m
header problems on
M
a
c OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Ju
n
io C Ham
a
n
o
M
er
g
e branch 'ew/svn
-
pm'
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
i
o
C Hama
n
o
diff documenta
t
ion: mostly talk
a
bout <commit>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ha
m
ano
Mer
g
e branch 'jc/
l
eft
r
ig
h
t
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
amano
M
e
rge b
r
anch
'
jc/blame'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hamano
Merge br
a
nch 'jc/branch-remo
v
e-remote'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
a
mano
Merge bra
n
ch 'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C H
a
mano
co
m
p
at/inet_ntop: do not u
s
e u_in
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C
H
amano
spurious
.
sp in manpa
g
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
i
o
C Hamano
g
i
t
-
a
d
d: er
r
or out
whe
n
giv
e
n no arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-20
J
u
n
io C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Nicolas
Pitre
clarify some
e
rror messages wrt unk
n
ow
n
object types
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Ha
m
an
o
simplify
i
nclusion of syste
m
h
eader files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
N
i
colas Pitre
ind
e
x
-pack
usa
g
e of mmap() i
s
unaccepta
b
ly slower on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Robert Fitzsimons
gitweb: Show '
.
.
.
' links
i
n "su
m
mary
"
view only if
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Hamano
conf
i
g
_
rename_section:
fix FILE* leak
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Bria
n
Gernhardt
Re
m
ove C
O
L
L
ISION
_
CHECK from Makefile si
n
ce
it's not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
fix
p
o
p
ulate-filespec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-20
Eric Wong
git-cvsse
r
ver: f
i
x br
e
a
k
a
g
e when calling git mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert
"
Make left-right
a
u
tom
a
tic
.
"
commit
|
commitdiff
|
tree
2006-12-19
J
osef We
i
dendorfer
Move "
n
o merge candidate
"
warning into git-pull
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C
Hamano
Use preprocessor
constants for env
i
ronment variable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
un
i
o
C
H
amano
Do
n
ot create $GIT_DIR
/
remotes/ directory anymo
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
a
mano
Mer
g
e
branch
'jc/te
s
t-clone' into
j
c
/c
l
on
e
commit
|
commitdiff
|
tree
2006-12-19
Joh
a
nnes Schin
d
e
l
in
Introduce
GIT_TEMP
L
ATE_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Hamano
R
e
ve
r
t
"
fix
t
estsuite: make sure they use te
m
plates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Ham
a
no
b
la
m
e: -b
(
blame
.
bl
a
nkbounda
r
y) and --root (blam
e
.
showroot)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Quy
Tont
h
at
git-branch -d: do no
t
stop
a
t th
e
first failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Hamano
Teach git-bran
c
h to d
e
let
e
tracking
b
ranches wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
f
ix testsuite: make s
u
re t
h
ey use template
s
freshly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
rerere: fix bre
a
kage of re
s
olvi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Anees
h
Kumar K
.
V
Add
config example with respect t
o
b
r
anch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-19
Brian Ger
n
hardt
Ad
d
documentation for show-branch --top
i
cs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Nicolas Pitre
make git
a
bit less crypt
i
c on fetch errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Nicola
s
Pitre
mak
e
p
a
tch_delta() error
case
s
a b
i
t more verbose
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
r
a
cy-git: docu
m
e
n
tation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
i
o C
Hamano
show
-
ref: fix --e
x
clude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Haman
o
parse-remote::expand_refs
_
wi
l
d
card()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Jeff Kin
g
vim synt
a
x: fo
l
low
recent chang
e
s to
co
m
mit
templ
a
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hama
n
o
show-ref:
f
ix
-
-ve
r
ify -
-
hash=length
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
s
how-ref: fi
x
-
-
quiet --
v
erify
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merg
e
b
ran
c
h 'jc/blame-boun
d
a
ry'
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C H
a
mano
Merge bra
n
ch 'jc/re
f
log' (
e
arly
p
a
r
t)
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
io
C Hama
n
o
M
erge br
a
nch 'j
s
/b
r
anch
-
config
'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
no
Me
r
ge bra
n
ch
'
j
n
/web' (early par
t
)
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio
C H
a
ma
n
o
avo
i
d access
i
ng
_
a
ll_ loos
e
refs
i
n git-show
-
ref -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
git-fetch: Avoid reading packed refs over
an
d
over
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
T
each s
h
o
w-bran
c
h how to
s
how
r
ef-log data
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o C Ha
m
ano
Make left-rig
h
t automatic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
Te
a
ch all
o
f log family --left-ri
g
ht output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
re
v
-list --left-righ
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io
C H
a
ma
n
o
ma
r
k
up fix in svnimpo
r
t documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Quy To
n
that
Documen
t
a
tion
:
new option -P for
g
it-svnimport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C Hamano
Fix mi
s
-mark
-
up in git-merg
e
-file
.
txt documentatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pearce
Def
a
ult GIT_COMMIT
T
ER_NAME to login n
a
me in
r
e
cieve
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
J
uni
o
C
Hama
n
o
Fix check_
f
ile_dire
c
tory_conflict()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C
H
a
m
a
no
gi
t
-ad
d
: remove conflictin
g
e
n
try when
a
d
ding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
u
p
date-ind
e
x: make D/F conflict error a bit more
v
erbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
o
h
annes Schind
e
li
n
git-branch: rename confi
g
vars
b
ra
n
c
h
.
<branc
h
>
.
*, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
J
o
h
a
nnes Schin
d
eli
n
ad
d
a f
u
nction to ren
a
me sectio
n
s i
n
t
he config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C Hamano
git-clone: los
e
the tradition
a
l 'no-separa
t
e
-remote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-clon
e
: lose the artific
i
al "first" fet
c
h refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
gi
t
-pull:
r
efus
e
default
merge
w
itho
u
t branch
.
*
.
merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C Hamano
git-clo
n
e: u
s
e wildcard specifi
c
a
t
ion
for tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
m
e
rge: give a b
i
t prettier merge message to "
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jakub Narebsk
i
gitweb: Add "next" l
i
nk to
c
o
mmi
t
view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jaku
b
Narebski
gitweb: Add title
a
ttrib
u
te t
o
ref mar
k
e
r
with full
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Jakub N
a
rebski
gitweb: Do not show
dif
f
t
ree for merges in "commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
E
r
ic
Wong
git-svn: ren
a
m
e 'com
m
i
t
' command to 'set-
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Eric Wong
git-sv
n
: remove
support for the
s
vn comma
n
d
-
line client
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Johanne
s
Schindel
i
n
Document git-merge-file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Quy
Tonthat
g
i
t-clone doc
u
m
e
n
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
A
n
dy P
a
rk
i
ns
git-stat
u
s always
s
a
y
s
what branc
h
it's on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
E
ric W
o
n
g
g
i
t
-
svn:
c
onvert to using
G
it
.
p
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
S
h
a
wn
O
.
Pearce
Ali
g
n section headers of 'gi
t
status' to
new 'git add'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Suggest
u
se of "
g
it
a
dd
file1
file2" when
t
here is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Brian Gernhardt
M
ake git-diff docum
e
ntation
u
se [--
]
when it should
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Bria
n
Gernhardt
Add --add opti
o
n to git-repo-
c
o
nfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
S
hawn
O
.
P
e
a
r
c
e
Tea
c
h bash
t
he new featur
e
s
of 'git show'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Luben Tuikov
Exp
o
r
t
PERL_PATH
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
S
hawn
O
.
Pear
c
e
Enable r
e
flogs by
defau
l
t in an
y
rep
o
s
i
tory wi
t
h a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pea
r
ce
Pr
o
vide mor
e
meaningful output from 'git init
-
db'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Nicola
s
Pit
r
e
m
a
k
e co
m
mit
m
e
s
s
age a
l
itt
l
e more co
n
sis
t
ent and conf
o
rtin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn O
.
P
earce
Avoi
d
a
ccessing a slo
w
working copy durin
g
diffcore
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge
bran
c
h 'js
/
s
h
ow'
commit
|
commitdiff
|
tree
next