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
xdl_merge(): introduce xmparam_t for merge specific parameters
2010-01-17
Junio C Hamano
xdl
_
m
e
rge
(
): introduce xmparam_t
f
or merge sp
e
c
ific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix function signatu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
Hamano
r
erere f
o
rget
path: fo
r
get re
c
orde
d
resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: refactor rere
r
e
l
og
i
c to
make it independent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
r
e
re:
r
emov
e
s
i
lly 1024-b
y
te
l
i
ne li
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io
C
Hamano
res
o
lve
-
undo: teac
h
"update
-
index
-
-un
r
esolve" t
o
use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
H
a
m
ano
reso
l
v
e
-undo: "che
c
k
o
ut -m path" uses r
e
solve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
resolve-und
o
: allow plumbing to
clear
t
he inf
o
rmatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
esolve-undo: basic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
resolve-
u
n
d
o:
r
e
c
ord reso
l
v
e
d conflicts in a
ne
w
i
n
d
e
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
built
i
n-merge
.
c: use stan
d
a
r
d active_cache macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
mano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C
H
amano
M
e
rg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
M
e
rge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C
H
amano
Merge branch '
m
ain
t
' to
sync
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
worktree: do
n
't
s
egfault with an absolute p
a
thspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
unio C Ha
m
ano
U
pdat
e
Release Notes f
o
r 1
.
6
.
6 to
r
e
m
ove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
Ham
a
no
Sync w
i
th 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C
H
aman
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C
H
a
mano
Fix
a
rchive
f
orma
t
with -- on the co
m
m
and line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C H
a
ma
n
o
Remove
p
ost-up
l
oad-hoo
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
M
e
rge git
:
//rep
o
.
or
.
cz/
g
it-
g
ui
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Mer
g
e
g
it://g
i
t
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Update draft release notes
to 1
.
6
.
6 before
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ha
m
ano
Merg
e
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hama
n
o
Merge branch
'
mm/maint-merg
e
-ff-e
r
ror-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
Hamano
Mer
g
e
branch 'jn/mai
n
t-pull-r
e
base
-
error-me
s
sage' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
M
e
rge branch 'jk
/
m
a
i
nt-add-p-d
e
lete-fix' in
t
o main
t
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge git:/
/
git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-12-08
J
u
n
i
o C Haman
o
Revert recent "git merge <msg> HEAD <commit>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
S
ync with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Ha
m
ano
G
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Prepar
e
for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
M
erge br
a
nch 'uk/maint
-
s
h
ortlog-encod
i
ng' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'fc/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge
b
r
a
nch 'ap
/
mai
n
t-merge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Merge branch
'jc/maint-am-keep'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
r
s/work
-
around-gr
e
p-opt-
i
ns
a
nity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hama
n
o
Merge b
r
anc
h
'rj/maint-cygwin-count-objects' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge
b
ranch 'mm/m
a
i
nt
-
hint-failed-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'th/maint-remote-up
d
ate-help-string' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge bran
c
h 'rj/
m
aint-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
ls/maint-mail
i
nf
o
-no-inbod
y
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge b
r
a
nch 'mo/m
a
int-crlf-d
o
c
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/re
m
ote
-
usage' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e branch
'pb/m
a
i
n
t
-use-
c
ustom-
p
e
rl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
e
rge branch 'mm/confi
g
-path
n
ame-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge br
a
n
c
h
'bc/grep-i-F' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
branch 'jk/maint-break-re
n
ame-reduce-
m
emory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/mai
n
t-simplify-cy
g
win-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch '
r
g/
d
o
c-workflow
'
int
o
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
ma
n
o
Mer
g
e b
r
anch 'np/main
t
-sid
e
ba
n
d
-f
a
vor-status' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
a
mano
Doc
u
me
n
ta
t
ion: xmlto 0
.
0
.
18 does not know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
amano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Git
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Uncon
d
it
i
onal
l
y set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C
Hamano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
H
amano
Merge
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
merge: do
n
ot add
s
t
a
ndard mes
s
age when mess
a
g
e is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not mis
i
dent
i
f
y
"git merge f
o
o
H
E
AD" as an old-st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
ama
n
o
Update draft
r
elease
notes t
o
1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ha
m
an
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
m
ano
Merge branch 'jc/dep
r
ecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C
Hama
n
o
git-m
e
r
ge: a de
p
recation noti
c
e of t
h
e ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
M
e
r
ge
b
ranch '
b
w/remote-
g
et-ref-
s
tat
e
s-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
ama
n
o
Merg
e
br
a
nch
'
jn/
g
itweb-blam
e
'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge branch 'fc/maint-format
-
p
a
tch-
p
athspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
ch '
m
m/maint-merge-
f
f-error-m
e
ssage-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ap/
m
a
i
n
t-merge-strategy-lis
t
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branc
h
'
j
c/pretty
-
lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
an
o
Merge
b
ranch 'cc
/
bisec
t
-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
an
o
Merge br
a
n
c
h
'
em/
c
omm
i
t
-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
nch 'jc/mailinfo-remov
e
-
b
racke
t
s'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
a
no
Mer
g
e bran
c
h
'fc/se
n
d-email-
e
n
velope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C
Ha
m
ano
M
erge bra
n
ch 'u
k
/
maint-shortlog-enc
o
ding'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge branch 'ns
/
se
n
d-email-no-ch
a
i
n
-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
nch 'jc/maint-a
m
-kee
p
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Ha
m
a
no
Merg
e
br
a
nch '
b
w/diff-c
o
lor-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Updat
e
draft re
l
ease
notes t
o
1
.
6
.
6 before mergi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line(): don
'
t
e
mit
a
n empty <SET><RESET> fo
l
lowed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hama
n
o
Remo
v
e de
a
d code
f
rom "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hamano
bu
i
ltin-a
p
ply
.
c: pay
attention to -p<n> when determinin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Haman
o
Merge branch
'
rs/wo
r
k-arou
n
d
-gr
e
p-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Hamano
Merge branch 'rj/ma
i
nt-cygw
i
n
-
count-ob
j
ects'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge bran
c
h
'rs/color
-
esca
p
e-has-
z
ero-width'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Ha
m
ano
Merge branch 'bg/apply-d
o
c'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Ham
a
n
o
Me
r
ge branch 'mm/
m
aint-hint-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
ano
M
e
r
ge branch 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge br
a
nch 'mr/gitw
e
b
-snap
s
hot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge bran
c
h 'cc
/
replace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C
H
amano
P
rote
c
t s
c
ript
e
d Por
c
elains f
r
om
G
REP_OPTIO
N
S insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Ad
d
trivial tests for --std
i
n
option
t
o
log f
a
m
i
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next