repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use branch names in 'git-rebase -m' conflict hunks.
2006-12-28
Shawn O
.
Pear
c
e
Use bran
c
h names in 'git-rebas
e
-m' con
f
lict
h
unks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
H
onor GIT_REFLOG_ACTION
i
n
git-rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
Pearce
Use GIT_REFLOG_
A
CT
I
ON env
i
r
o
nment vari
a
bl
e
i
nstead
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub
Na
r
ebski
gitweb: Prec
o
mp
i
l
e
C
GI
r
outines for
m
o
d
_perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
J
a
kub Nareb
s
ki
git
w
eb: Add mo
d
_perl version stri
n
g to "generator"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C H
a
mano
Mer
g
e branch
'sp/gc'
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o
C
Hamano
Set NO_MMAP for
Cygwin by default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
U
s
e
'repack -a -d -l' i
n
stea
d
of 'r
e
pack
-
a
-
d' in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
R
o
bert
F
itzsimo
n
s
gitweb: Re-enabl
e
r
e
v-list --parents fo
r
parse_commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Quy Tonthat
g
it-se
n
d-email: defau
l
t value for "From:" fiel
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C Hamano
everyday: replace a few 'prune' and 'repa
c
k'
with 'gc
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
S
hawn
O
.
Pear
c
e
Create 'git gc' t
o
perfo
r
m commo
n
maint
e
nan
c
e operations
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Haman
o
git-reflog: gc
.
*
c
onf
i
gura
t
i
o
n and
do
c
ume
n
tation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Hamano
rerer
e
gc: honor c
o
nfigura
t
i
on and document it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C H
a
mano
c
ount-object
s
-v:
s
how number of packs as
well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Ju
n
i
o
C Ha
m
an
o
Merg
e
branc
h
'jc/fsc
k
-reflog'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
everyday
:
update
f
or v1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
g
i
t-svn: dco
m
mit should
d
i
ff against the current HEAD
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Er
i
c Wong
git
-
svn: quiet down tests and fix some u
n
p
o
rtable s
h
ell
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
A
ndy Parkins
h
ooks/commit-msg: add exa
m
p
l
e to add Si
g
ned-off-by
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nic
o
l
a
s Pitre
move git-blame
to it
s
p
l
ace in
.
gi
t
ign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
N
icolas Pit
r
e
Add git-reflog to
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
unio C
H
amano
Do
c
ument git-reset <co
m
mit> -- <paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
u
ni
o
C Hamano
Document --numst
a
t in git-apply and
g
it-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
u
nio C Hamano
sho
w
-br
a
n
c
h
-
-
reflog
:
a
dd document
a
t
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
add
.
m
ailm
a
p for
git-shortlog
outpu
t
w
i
t
h the git repository
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Ju
n
i
o
C Hamano
GIT v1
.
5
.
0 pre
v
i
ew
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
aman
o
Merge branc
h
'jc/bm'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Merge
branch
'rf/w
e
b'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Ha
m
a
n
o
gi
t
-
add
-f
:
allow adding otherwise ig
n
ored
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitz
s
imons
gitweb
:
U
s
e
r
ev-list --ski
p
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitweb: Change history action
t
o
u
s
e
parse
_
commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsi
m
ons
gitweb: Chang
e
atom, rss actions to us
e
parse_co
m
m
i
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
be
r
t
F
itzsimons
gitweb:
Change
h
eader search action to use parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitweb:
C
h
ang
e
log ac
t
ion to
u
se parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsim
o
ns
g
itwe
b
: Change
summary,
sh
o
rt
l
og act
i
ons to use parse_com
m
its
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
ert Fi
t
z
s
imo
n
s
gitweb: We do longer
n
eed the --parents
f
l
ag in rev
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gi
t
w
eb
:
A
dd parse_comm
i
ts, used
t
o bulk load commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
H
a
m
a
n
o
git-add: warn when a
d
ding an ignore
d
file wit
h
an explicit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
no
g
it-add: add ignored files
whe
n
ask
e
d exp
l
i
c
itly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
read_directory: s
h
ow_
b
oth option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
Haman
o
g
it
-
rm: Docume
n
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
n
i
o C Hamano
t3600:
upd
a
te the t
e
st for
updated git rm
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C H
a
mano
git-
r
m:
u
pd
a
te
t
o
saner
seman
t
ics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
uni
o
C Haman
o
match_
p
athspec() --
r
e
t
u
rn how
well the sp
e
c matc
h
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C
H
am
a
n
o
Merge br
a
n
c
h 'jc/skip-count'
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C
Hamano
Merge branc
h
'jc/git-add--inte
r
active'
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o C Hamano
git
-
add --int
e
racti
v
e: add doc
u
mentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
J
un
i
o
C H
a
mano
Allow branc
h
.
*
.
merge to talk ab
o
ut remote
t
racking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C
H
amano
Merge branch 'sb/mer
g
e-fri
e
n
d
ly'
commit
|
commitdiff
|
tree
2006-12-24
J
u
n
i
o C Hamano
M
erg
e
bra
n
ch 'js
/
r
e
rere'
commit
|
commitdiff
|
tree
2006-12-24
Jo
h
annes
S
chindelin
c
o
m
mit-tree: e
n
courage UTF-8 commit m
e
ssages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
S
h
a
wn O
.
P
e
ar
c
e
S
w
it
c
h git_mmap
t
o use pread
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Sh
a
wn O
.
Pearce
Rename
gitfakemmap
t
o git_mmap
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
git
w
e
b
: P
a
ginate co
m
mit
/
a
utho
r
/commit
t
er search
o
utput
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Makefil
e
:
a
dd quick-insta
l
l-doc for ins
t
alli
n
g pre
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
S
haw
n
O
.
P
e
arce
Display 't
h
eirs' br
a
n
c
h n
a
me
w
hen p
o
s
sible in merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Use e
x
t
e
n
ded SHA1 syntax in merge-recu
r
s
i
ve
con
f
licts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
reflog exp
i
r
e: do not p
u
nt on ta
g
s that point at non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
obe
r
t Fitzsim
o
ns
gitweb: Allow
s
earch to be disabled from the config
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt
Fitzsimons
gitweb: Req
u
ir
e
a minimum of two character
f
o
r the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fit
z
sim
o
ns
gitweb
:
Use rev-li
s
t
pat
t
ern search
options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Nicolas Pitre
check
o
ut
:
make th
e
message about the need
f
o
r a new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt F
i
tzsimons
gitweb
:
optimize gi
t
_summary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzs
i
mons
g
i
t
w
eb: optimiz
e
git_
s
hortlog_body
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
b
ert
Fitzs
i
mons
git
w
eb: optimize git_get_las
t
_activity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fit
z
simons
gitweb: Add missing show '
.
.
.
'
links chang
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian
G
ernha
r
dt
Make git-show-branch optio
n
s simila
r
to git-br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
B
rian
G
ernhardt
Keep "git --git
-
dir" from cau
s
i
ng a bus error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Er
i
c Wong
g
i
t
-
svn: enable common fetc
h
/com
m
it optio
n
s
for dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
A
lexandre Julliard
vc-git: Ignore erro
r
s cause
d
by a non-e
x
ist
e
nt d
i
rectory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Remove NO
_
ACCUR
A
TE_DIFF options fr
o
m build systems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
J
unio C Hama
n
o
git-tag: los
e
exit aft
e
r di
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio
C
H
aman
o
Really f
i
x
headers
f
or __FreeBSD__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hama
n
o
Do not support "partial URL
shorthand" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
i
o C Hamano
default pull: forget
about "newbie
protection" fo
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
nio C Hama
n
o
merge and re
s
e
t
:
adjust
f
or "reset -
-
ha
r
d" me
s
sages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Ham
a
n
o
reflog expire: prune commits that are not in
c
omplete
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
H
a
mano
commit-tree: do not
o
v
erflo
w
MAXPAREN
T
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s Schindelin
Make
git-rerere a built
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
ha
n
nes Schindelin
A
dd a t
e
st for git-rerere
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es
S
ch
i
n
delin
move read_m
m
fi
l
e() into xdi
f
f-
i
nte
r
f
a
ce
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pear
c
e
Don't crash duri
n
g
repack of a r
e
flog with
p
runed commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o
C
Hamano
Merg
e
b
r
a
n
c
h
'master' into jc/fsc
k
-reflog
commit
|
commitdiff
|
tree
2006-12-22
S
h
awn O
.
Pearc
e
In
t
r
oduce a global level w
a
rn() func
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Rename imap-send
'
s internal info/warn functions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Hama
n
o
_
XOPEN_S
O
URCE
p
roblem
a
lso exi
s
ts on FreeBSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hama
n
o
pa
r
s
e-remote: mark all refs
n
ot for merge only when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Sc
h
indelin
git-reset --hard: tell the
u
s
e
r
what the HEAD was
reset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schinde
l
in
git-t
a
g
:
support
-F <file> optio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
uni
o
C
Hamano
Revert "git-pu
l
l
: r
e
fus
e
def
a
u
lt
merge with
o
ut branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Suggest
'add' in
a
m/revert/cherry-
p
i
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes
S
chindel
i
n
Use
g
it-merge-file in git-merge-
o
n
e-file, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
diff
--chec
k
: fix off
by
o
n
e error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Quy Tonthat
Documen
t
ati
o
n/git-branch: new -
r
to delete
remo
t
e-track
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Terje Sten Bje
r
kse
t
h
F
ix system header problems
on M
a
c OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
J
unio C Hamano
g
i
t
reflo
g
expire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Move i
n
_merge_bases()
t
o
commit
.
c
commit
|
commitdiff
|
tree
2006-12-21
Junio C Ha
m
a
n
o
reflog:
fix w
a
rning mes
s
ag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next