repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://ozlabs.org/~paulus/gitk
2013-01-23
Junio C H
a
mano
Merge git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Me
r
ge branch 'jc/merge-blobs'
commit
|
commitdiff
|
tree
2013-01-22
R
a
m
say Jones
Ma
k
ef
i
le:
R
e
p
lace me
r
g
e
-file
.
h wit
h
merge-blobs
.
h in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
amano
Update draft r
e
lease
n
o
t
e
s
to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Merge branch 'm
z
/re
s
et-misc'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hama
n
o
Merge
b
r
a
n
ch 'nd/fix-directory-at
t
rs-off-by-one'
commit
|
commitdiff
|
tree
2013-01-22
Ju
n
io C Hamano
Merge bran
c
h '
p
w/p4-branch-fixes'
commit
|
commitdiff
|
tree
2013-01-22
Junio C Hamano
Me
r
ge br
a
nch 'mh/rem
o
t
e
-
hg-mode-bits-fix'
commit
|
commitdiff
|
tree
2013-01-22
Junio C
H
a
m
ano
Merge branch 'fc/rem
o
t
e-hg-fixup-url'
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o
C Hamano
Merge br
a
nch 'zk/clean-report-fa
i
lure'
commit
|
commitdiff
|
tree
2013-01-22
Jun
i
o C H
a
mano
Merge branch 'ph/
r
e
base-pr
e
s
e
rve-all
-
merges'
commit
|
commitdiff
|
tree
2013-01-22
Junio
C
Hama
n
o
Merge branch '
n
d/clone-no-separate-git-dir-w
i
th-bare'
commit
|
commitdiff
|
tree
2013-01-22
J
unio C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2013-01-22
John
Keeping
git-fo
r
-each-r
e
f
.
txt: 'raw' is a s
u
p
p
orted date
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio C Hamano
Update draft release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2013-01-21
Juni
o
C Hamano
Start preparing for 1
.
8
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-21
Junio C Hamano
M
e
r
ge
branch 'nz/se
n
d-email-headers-are
-
ca
s
e-insensitive
.
.
.
commit
|
commitdiff
|
tree
2013-01-21
Jun
i
o C Hamano
Merg
e
b
ranch 'rs/z
i
p-
w
ith
-
unco
m
p
re
s
sed-
s
ize
-
in-the
.
.
.
commit
|
commitdiff
|
tree
2013-01-21
J
u
ni
o
C Hamano
Merge bra
n
ch
'
rs/zip-tests' into maint
commit
|
commitdiff
|
tree
2013-01-21
Junio
C
Hamano
Me
r
ge gi
t
://git
.
bog
o
m
ips
.
o
r
g
/git-svn
commit
|
commitdiff
|
tree
2013-01-21
Jun
i
o C Hamano
Merge b
r
anch 'rt/commit-cleanup-co
n
fig'
commit
|
commitdiff
|
tree
2013-01-21
J
u
nio
C
Hamano
M
erge bran
c
h 'ap/log-mailmap
'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Hamano
Merge
git://bog
o
mips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2013-01-18
J
uni
o
C H
a
m
ano
U
p
date draf
t
re
l
ease not
e
s to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-18
Juni
o
C Hamano
Me
r
ge branch 'ss/hel
p
-
h
tmlpath-config-doc'
commit
|
commitdiff
|
tree
2013-01-18
Junio
C
H
a
mano
Merge
branc
h
'nd/fix-
p
erf-parameters-i
n
-t
e
sts'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Ham
a
no
Merge br
a
n
c
h
'
nd/attr-d
e
bug
-
fix'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Haman
o
Merg
e
bran
c
h 'rs/pre
t
ty-use-prefi
x
cmp'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Hamano
Mer
g
e br
a
nch 'ds/completion-sil
e
nce
-
in-tree-path-probe'
commit
|
commitdiff
|
tree
2013-01-18
J
u
n
io C Hamano
Merge
branch '
j
n/maint-trim-vim-contr
i
b'
commit
|
commitdiff
|
tree
2013-01-18
Junio C
H
amano
Merge bra
n
ch 'pe/doc-email-
e
nv-is-trumped-by-c
o
nfig'
commit
|
commitdiff
|
tree
2013-01-18
Junio C Hamano
Mer
g
e branch 'mk
/
complete-tcsh'
commit
|
commitdiff
|
tree
2013-01-16
Mar
t
in
v
on Zweigbergk
reset: update documentation
to re
q
u
i
re only
tree-
i
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-16
D
u
y Nguyen
at
t
r:
avoid calling find
_
basename(
)
twice
p
er path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Seba
s
tian Staudt
config
.
txt: Document
help
.
html
p
ath
con
f
ig parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Nguyễn Thái N
g
ọc Duy
te
s
t-lib
.
sh: un
f
il
t
er GI
T
_PERF_*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Nguy
ễ
n T
h
á
i Ngọ
c
Duy
at
t
r:
m
ake it
build with DEBU
G
_
ATTR again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
ax H
o
rn
remote-
h
g:
fix
h
andling of file
perms when push
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Felipe
C
ont
r
eras
remote-hg: store co
n
ve
r
ted URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
te Wyckoff
git p4: fix
s
u
b
mit w
h
en n
o
m
a
s
ter branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wy
c
koff
git
p
4
t
e
s
t
: keep P4CLIENT c
h
anges insid
e
subshells
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git p4: fix
sy
n
c
--bra
n
ch when no mast
e
r branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pe
t
e
Wyckoff
git
p
4: fail grace
f
ully on sync
w
ith no master
branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pe
t
e Wyckoff
git p4: rearrange self
.
initialParent u
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git
p
4: allow short r
e
f
names to
-
-
b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyc
k
off
git p4 doc:
fix branch detecti
o
n example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
Wyckoff
git p4: clone --
b
r
anch s
h
ou
l
d chec
k
out master
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wy
c
k
o
ff
g
i
t p4
:
veri
f
y expected refs in clon
e
--
b
are t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyc
k
off
gi
t
p4: cre
a
te p4/HEAD on
i
ni
t
ia
l
clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
W
y
ckoff
git p
4
: inline listExist
i
ng
P
4GitBranches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
W
yckof
f
git p4:
a
dd
c
omments to p4Branches
I
nGit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
P
e
te
Wycko
f
f
git
p
4:
rear
r
ange and
simplify hasOrigin h
a
nd
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Pet
e
Wyckoff
gi
t
p4: test sync
/
clo
n
e --branch be
h
avior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Z
weigbergk
reset [
-
-mixed]:
use dif
f
-
b
ase
d
reset whether or no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von
Z
weigbergk
reset: all
o
w reset
on unb
o
r
n
bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin von Zweigbe
r
gk
reset $sh
a
1
$pathspec: require $
s
ha1 on
l
y to be tr
e
eish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in von Zweigber
g
k
reset
.
c: i
n
line
u
pdate
_
index_ref
r
e
sh()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset
.
c: finish entir
e
cmd_r
e
set() whether or
not pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Z
w
eigbergk
reset [--mixed]
:
on
l
y
write i
n
dex file once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigbergk
reset
.
c: move lock,
w
rite and com
m
it o
u
t of
u
pd
a
te_index_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in von Zwei
g
bergk
reset
.
c: move up
d
a
te_index_refresh() cal
l
out of read_
f
rom_t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin von Zweig
b
e
r
gk
reset
.
c: replace
s
witch
by if-else
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n v
o
n Zwei
g
bergk
reset: avoid redundant err
o
r me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Z
weigbergk
reset --keep: only write in
d
ex file on
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von Zweigbergk
reset
.
c: share
c
a
l
l
to
d
i
e_if_unmerged_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset
.
c: extract function for updating {ORIG_,}
H
EAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n vo
n
Zweigbergk
reset
.
c
:
rem
o
v
e
u
n
necess
a
ry va
r
i
able 'i'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Zw
e
igbergk
reset
.
c: extract functi
o
n for parsing arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset:
d
on'
t
allow
"
g
it r
e
set -- $pathspec
"
in bare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
r
tin von Zweig
b
e
r
gk
reset
.
c: pass pathspec around ins
t
e
ad of
(
pr
e
f
i
x, argv
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset $
p
athspec: exit with code 0
i
f
successful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Z
weigbergk
rese
t
$pathsp
e
c: no need to d
i
scard i
n
de
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-15
N
g
uyễn
T
h
ái
Ng
ọ
c D
u
y
a
t
tr
:
fix of
f
-by-one dir
e
ctory component len
g
th calculati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
René Scharfe
pre
t
ty:
u
se prefixcmp in
s
tead of memcm
p
on NUL-t
e
rmina
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil Hord
rebas
e
--preserve-m
e
rg
e
s: keep
a
ll merge commits in
c
l
uding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Zoltan Klinger
git-clean
:
D
isplay more accurate dele
t
e messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Juni
o
C Ham
a
no
Sync with 1
.
8
.
1
.
1
commit
|
commitdiff
|
tree
2013-01-14
Juni
o
C Hamano
Update
d
raft release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
Mer
g
e branc
h
'jc/blam
e
-no-follo
w
'
commit
|
commitdiff
|
tree
2013-01-14
Junio C
Hamano
Me
r
ge branch 'fc/rem
o
te-testgit-feature-don
e
'
commit
|
commitdiff
|
tree
2013-01-14
Junio
C
Hamano
Merge branch '
n
d/upload-pack-shallow-must-be-comm
i
t'
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
Merge branch 'ap/stat
u
s-ignored-in-ignored-direct
o
ry'
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hama
n
o
M
e
rge branc
h
'nz/send-email
-
headers-are-case-insensitive'
commit
|
commitdiff
|
tree
2013-01-14
J
uni
o
C Hamano
Git 1
.
8
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Junio
C
Hamano
M
e
r
g
e
b
ranch
'
jk
/
complete-co
m
mit-c
'
into maint
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
M
e
rge branch
'jk/unify
-
e
x
it-cod
e
-by-rece
i
vi
n
g-signal
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
u
n
i
o
C
H
amano
Merge branch 'jn/xml-depends-on-asciidoc-conf
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio
C
Haman
o
Merge branch 'jk/maint
-
fast-imp
o
rt-doc-reorder' int
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio C Ham
a
no
Merge bran
c
h
'jk/shortlog
-
no-wrap-d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2013-01-14
Junio C Hamano
Merge branch 'jk/m
a
int-fa
s
t-import-doc
-
d
edup-done'
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Jun
i
o C Hamano
Merge branch 'jc/
c
omment-cy
g
win-win32api-in-make
f
i
l
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
un
i
o
C Hamano
Merge bran
c
h 'rs/leav
e
-base-name-in-name
-
field-of-
t
ar
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio C H
a
mano
Merge branch 'jl/interrupt-clone-re
m
ove-separ
a
te-git
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Ju
n
io C Hamano
M
e
rge branc
h
'jc/ma
i
nt-fmt-merge
-
ms
g
-no-edit-lose-credit
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
Junio C
H
amano
Merge
branch 'jc/apply-trailing-blan
k
-removal'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2013-01-14
J
unio C Hamano
Merge bran
c
h 'pf/edi
t
or-ignore-
s
igin
t
'
int
o
maint
commit
|
commitdiff
|
tree
2013-01-14
Junio C Ha
m
ano
Merge branch 'mk/maint-grap
h
-infinity-loo
p
'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-12
J
u
nio C Hamano
Update d
r
aft release n
o
tes
t
o 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-12
J
u
nio C
Hamano
M
erge br
a
nc
h
'jk/maint-fast-import-doc-reorder'
commit
|
commitdiff
|
tree
next