1 Version v1.7.10-rc4; changes since v1.7.10-rc3:
2 -----------------------------------------------
5 string-list: document that string_list_insert() inserts unique strings
8 l10n: Improve zh_CN translation for Git 1.7.10-rc3
11 merge: backport GIT_MERGE_AUTOEDIT support
16 l10n: Inital Portuguese Portugal language (pt_PT)
19 gitk: fix tabbed preferences construction when using tcl 8.4
20 gitk: fix setting font display with new tabbed dialog layout.
23 config: remove useless assignment
25 Vincent van Ravesteijn (1):
26 l10n: Add the Dutch translation team and initialize nl.po
29 Version v1.7.10-rc3; changes since v1.7.10-rc2:
30 -----------------------------------------------
33 gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields
36 l10n: Update git.pot (1 new message)
37 l10n: Update zh_CN translation for Git 1.7.10-rc1
38 l10n: Review zh_CN translation for Git 1.7.10-rc1
39 Add url of Swedish l10n team in TEAMS file
42 gitk: Make "git describe" output clickable, too
43 correct spelling: an URL -> a URL
44 correct a few doubled-word nits in comments and documentation
47 gitk: Use symbolic font names "sans" and "monospace" when available
51 Update draft release notes to 1.7.10
55 gitk: Teach gitk to respect log.showroot
58 grep doc: add --break / --heading / -W to synopsis
60 Nelson Benitez Leon (1):
61 documentation: fix alphabetic ordered list for git-rebase man page
64 gitk: Use a tabbed dialog to edit preferences
65 gitk: Fix the display of files when filtered by path
68 gitk: Speed up resolution of short SHA1 ids
69 gitk: Add menu items for comparing a commit with the marked commit
72 Update Swedish translation (724t0f0u).
74 Rodrigo Silva (MestreLion) (1):
75 Documentation: improve description of GIT_EDITOR and preference order
77 Zbigniew Jędrzejewski-Szmek (2):
78 gitk: Use "gitk: repo-top-level-dir" as window title
79 tests: unset COLUMNS inherited from environment
82 Version v1.7.10-rc2; changes since v1.7.10-rc1:
83 -----------------------------------------------
86 contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
89 Documentation/gitweb: trivial English fixes
92 fast-import: leakfix for 'ls' of dirty trees
93 fast-import: don't allow 'ls' of path with empty components
96 fetch/receive: remove over-pessimistic connectivity check
97 Update draft release notes to 1.7.10
98 .mailmap: unify various old mail addresses of gitster
101 Stefano Lattarini (1):
102 configure: allow user to prevent $PATH "sanitization" on Solaris
105 Documentation/diff-options: reword description of --submodule option
106 contrib/diffall: comment actual reason for 'cdup'
107 contrib/diffall: create tmp dirs without mktemp
108 contrib/diffall: eliminate use of tar
109 contrib/diffall: eliminate duplicate while loops
110 contrib/diffall: fix cleanup trap on Windows
111 Documentation/difftool: add deltawalker to list of valid diff tools
113 Ævar Arnfjörð Bjarmason (2):
114 Git::I18N: compatibility with perl <5.8.3
115 perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
118 Version v1.7.10-rc1; changes since v1.7.10-rc0:
119 -----------------------------------------------
122 verify-tag: Parse GPG configuration options.
125 gitweb: Fix fixed string (non-regexp) project search
128 submodules: always use a relative path to gitdir
129 submodules: always use a relative path from gitdir to work tree
130 submodules: refactor computation of relative gitdir path
133 l10n: Update zh_CN translation for 1.7.9.2
134 l10n: Update git.pot (1 new message)
135 l10n: Update zh_CN translation for 1.7.10-rc0
138 submodules: fix ambiguous absolute paths under Windows
141 Update draft release notes to 1.7.10
142 t0204: clarify the "observe undefined behaviour" test
143 i18n: fix auto detection of gettext scheme for shell scripts
145 Update draft release notes to 1.7.10 before -rc1
146 am: officially deprecate -b/--binary option
150 fix deletion of .git/objects sub-directories in git-prune/repack
153 config: report errors at the EOL with correct line number
156 po/sv.po: add Swedish translation
157 Update Swedish translation (732t0f0u).
160 rerere: Document 'rerere remaining'
163 perf: load test-lib-functions from the correct directory
164 perf: export some important test-lib variables
165 p4000: use -3000 when promising -3000
166 git-am: error out when seeing -b/--binary
169 l10n: Improve zh_CN translation for lines insertion and deletion.
170 l10n: Improve zh_CN translation for msg about branch deletion deny
171 l10n: Improve zh_CN translation for empty cherry-pick msg.
172 l10n: Improve zh_CN translation for msg that make empty commit when amend.
173 l10n: Improve commit msg for zh_CN translation
174 l10n: Improve zh_CN trans for msg that cannot fast-forward
175 l10n: Improve zh_CN translation for msg "not something we can merge"
177 Vincent van Ravesteijn (3):
178 Documentation/git-branch: cleanups
179 Documentation/git-branch: fix a typo
180 Documentation/git-branch: add default for --contains
183 Version v1.7.10-rc0; changes since v1.7.9.6:
184 --------------------------------------------
187 completion: --edit and --no-edit for git-merge
190 add a Makefile switch to avoid gettext translation in shell scripts
192 Bernhard R. Link (6):
193 gitweb: move hard coded .git suffix out of git_get_projects_list
194 gitweb: prepare git_get_projects_list for use outside 'forks'.
195 gitweb: add project_filter to limit project list to a subdirectory
196 gitweb: limit links to alternate forms of project_list to active project_filter
197 gitweb: show active project_filter in project_list page header
198 gitweb: place links to parent directories in page header
200 Carlos Martín Nieto (1):
201 Make git-{pull,rebase} message without tracking information friendlier
203 Clemens Buchacher (3):
204 git-daemon: add tests
205 git-daemon: produce output when ready
206 git-daemon tests: wait until daemon is ready
209 vcs-svn: set up channel to read fast-import cat-blob response
210 vcs-svn: quote paths correctly for ls command
211 vcs-svn: use mark from previous import for parent commit
212 vcs-svn: pass paths through to fast-import
213 vcs-svn: drop string_pool
215 vcs-svn: drop obj_pool
216 vcs-svn: avoid using ls command twice
217 vcs-svn: implement text-delta handling
220 vcs-svn: do not initialize report_buffer twice
221 vcs-svn: reset first_commit_done in fast_export_init
223 Felipe Contreras (4):
224 remote: use a local variable in match_push_refs()
225 remote: reorganize check_pattern_match()
226 remote: refactor code into alloc_delete_ref()
227 push: add '--prune' option
229 Frederic Heitzmann (1):
230 completion: add --interactive option to git svn dcommit
233 gitweb: improve usability of projects search form
234 gitweb: Make project search respect project_filter
235 gitweb: Harden and improve $project_filter page title
236 gitweb: Refactor checking if part of project info need filling
237 gitweb: Option for filling only specified info in fill_project_list_info
238 gitweb: Faster project search
239 gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
240 gitweb: Highlight matched part of project name when searching projects
241 gitweb: Highlight matched part of project description when searching projects
242 gitweb: Highlight matched part of shortened project description
243 gitweb: Fix passing parameters to git_project_search_form
246 symbolic-ref --short: abbreviate the output unambiguously
249 Add threaded versions of functions in symlinks.c.
252 parse_object: try internal cache before reading object db
253 upload-pack: avoid parsing objects during ref advertisement
254 upload-pack: avoid parsing tag destinations
255 t0300: use write_script helper
256 docs: add a basic description of the config API
257 drop odd return value semantics from userdiff_config
258 diff-highlight: make perl strict and warnings fatal
259 diff-highlight: don't highlight whole lines
260 diff-highlight: refactor to prepare for multi-line hunks
261 diff-highlight: match multi-line hunks
262 diff-highlight: document some non-optimal cases
263 docs/api-config: minor clarifications
264 t1300: add missing &&-chaining
265 config: copy the return value of prefix_filename
266 config: teach git_config_set_multivar_in_file a default path
267 config: teach git_config_rename_section a file argument
268 config: provide a version of git_config with more options
269 config: stop using config_exclusive_filename
270 config: eliminate config_exclusive_filename
271 config: add include directive
274 Add a setting to require a filter to be successful
277 test-lib: add the test_pause convenience function
280 l10n: initial git.pot for 1.7.10 upcoming release
282 l10n: Update git.pot (12 new messages)
283 l10n: update Chinese translation to the new git.po
284 Update l10n guide: change the repository URL, etc
286 Jonathan Nieder (23):
287 vcs-svn: use higher mark numbers for blobs
288 vcs-svn: save marks for imported commits
289 vcs-svn: add a comment before each commit
290 vcs-svn: eliminate repo_tree structure
291 vcs-svn: handle filenames with dq correctly
292 Makefile: list one vcs-svn/xdiff object or header per line
293 vcs-svn: learn to maintain a sliding view of a file
294 vcs-svn: make buffer_read_binary API more convenient
295 vcs-svn: skeleton of an svn delta parser
296 vcs-svn: parse svndiff0 window header
297 vcs-svn: read the preimage when applying deltas
298 vcs-svn: read inline data from deltas
299 vcs-svn: read instructions from deltas
300 vcs-svn: implement copyfrom_data delta instruction
301 vcs-svn: verify that deltas consume all inline data
302 vcs-svn: let deltas use data from postimage
303 vcs-svn: let deltas use data from preimage
304 test-svn-fe: split off "test-svn-fe -d" into a separate function
305 vcs-svn: cap number of bytes read from sliding view
306 vcs-svn: guard against overflow when computing preimage length
307 vcs-svn: avoid hangs from corrupt deltas
308 vcs-svn: allow import of > 4GiB files
309 vcs-svn: suppress a -Wtype-limits warning
312 git-sh-i18n: restructure the logic to compute gettext.sh scheme
313 i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
314 merge: use editor by default in interactive sessions
315 push: do not let configured foreign-vcs permanently clobbered
316 t9801: do not overuse test_must_fail
317 i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
318 vcs-svn/svndiff.c: squelch false "unused" warning from gcc
319 Kick off the post 1.7.9 cycle
320 Update draft release notes to 1.7.10
321 Update draft release notes to 1.7.10
322 Update draft release notes to 1.7.10
323 Update draft release notes to 1.7.10
324 Update draft release notes to 1.7.10
325 Update draft release notes to 1.7.10
326 t9100: remove bogus " || test" after each test scriptlet
327 merge: do not trust fstat(2) too much when checking interactiveness
328 Update draft release notes to 1.7.10
329 Update draft release notes to 1.7.10
330 Update draft release notes to 1.7.10
331 grep: use static trans-case table
332 fsck: --no-dangling omits "dangling object" information
333 pickaxe: allow -i to search in patch case-insensitively
335 diff --stat: tests for long filenames and big change counts
336 Update draft release notes to 1.7.10
337 Update draft release notes to 1.7.10
338 fsck doc: a minor typofix
342 "git pull" doesn't know "--edit"
345 git-p4: handle p4 branches and labels containing shell chars
346 git-p4: cope with labels with empty descriptions
347 git-p4: importing labels should cope with missing owner
348 git-p4: add test for p4 labels
349 git-p4: label import fails with multiple labels at the same changelist
350 git-p4: add initial support for RCS keywords
352 Michael Haggerty (11):
353 pack_refs(): remove redundant check
354 ref_array: keep track of whether references are sorted
355 add_packed_ref(): new function in the refs API.
356 write_remote_refs(): create packed (rather than extra) refs
357 t5700: document a failure of alternates to affect fetch
358 clone.c: move more code into the "if (refs)" conditional
359 fetch-pack.c: rename some parameters from "path" to "refname"
360 fetch-pack.c: inline insert_alternate_refs()
361 everything_local(): mark alternate refs as complete
362 clone: do not add alternate references to extra_refs
363 refs: remove the extra_refs API
365 Michał Kiedrowicz (2):
366 pack-objects: Fix compilation with NO_PTHREDS
367 grep -P: add tests for matching ^ and $
369 Nelson Benitez Leon (1):
370 http: support proxies that require authentication
372 Nguyễn Thái Ngọc Duy (20):
373 clone: add --single-branch to fetch only one branch
374 Fix incorrect ref namespace check
375 Eliminate recursion in setting/clearing marks in commit list
376 index-pack: eliminate recursion in find_unresolved_deltas
377 index-pack: eliminate unlimited recursion in get_base_data()
378 t5601: add missing && cascade
379 clone: write detached HEAD in bare repositories
380 clone: factor out checkout code
381 clone: factor out HEAD update code
382 clone: factor out remote ref writing
383 clone: delay cloning until after remote HEAD checking
384 clone: --branch=<branch> always means refs/heads/<branch>
385 clone: refuse to clone if --branch points to bogus ref
386 clone: allow --branch to take a tag
387 clone: print advice on checking out detached HEAD
388 clone: fix up delay cloning conditions
389 pack-objects: do not accept "--index-version=version,"
390 pack-objects: remove bogus comment
391 pack-objects: convert to use parse_options()
392 cache-tree: update API to take abitrary flags
395 git-p4: only a single ... wildcard is supported
396 git-p4: fix verbose comment typo
397 git-p4: clarify comment
398 git-p4: adjust test to adhere to stricter useClientSpec
399 git-p4: add tests demonstrating spec overlay ambiguities
400 git-p4: Change p4 command invocation
403 cherry-pick: No advice to commit if --no-commit
405 Philip Jägenstedt (2):
406 completion: remote set-* <name> and <branch>
407 completion: normalize increment/decrement style
409 Ramkumar Ramachandra (2):
410 revert: prepare to move replay_action to header
411 sequencer: factor code out of revert builtin
413 Ramsay Allan Jones (3):
414 vcs-svn: rename check_overflow arguments for clarity
415 builtin/tag.c: Fix a sparse warning
416 ctype.c: Fix a sparse warning
419 xdiff: print post-image for common records instead of pre-image
420 test-parse-options: convert to OPT_BOOL()
421 parse-options: allow positivation of options starting, with no-
422 parse-options: remove PARSE_OPT_NEGHELP
423 parse-options: typo check for unknown switches
426 l10n: update zh_CN translation for "Fetching %s"
429 git-p4: the option to specify 'host' is -H, not -h
431 Stefano Lattarini (1):
432 t0000: modernise style
435 git-svn.perl: perform deletions before anything else
436 git-svn.perl: fix a false-positive in the "already exists" test
439 am: learn passing -b to mailinfo
440 mailinfo: with -b, keep space after [foo]
441 Move the user-facing test library to test-lib-functions.sh
442 Introduce a performance testing framework
443 Add a performance test for git-grep
444 perf: compare diff algorithms
447 contrib: add git-diffall script
448 mergetools: add a plug-in to support DeltaWalker
451 tag: add --points-at list option
454 git-p4: Search for parent commit on branch creation
455 git-p4: Add test case for complex branch import
457 Wei-Yin Chen (陳威尹) (1):
458 git-svn: Fix time zone in --localtime
461 l10n: fast-forward here is ff-only merge, not push
463 Zbigniew Jędrzejewski-Szmek (11):
464 make lineno_width() from blame reusable for others
465 send-email: document the --smtp-debug option
466 git-p4: missing she-bang line in t9804 confuses prove
467 diff --stat: use the full terminal width
468 show --stat: use the full terminal width
469 log --stat: use the full terminal width
470 merge --stat: use the full terminal width
471 diff --stat: use a maximum of 5/8 for the filename part
472 diff --stat: add a test for output with COLUMNS=40
473 diff --stat: enable limiting of the graph part
474 diff --stat: add config option to limit graph width
477 l10n: leave leading space unchanged for zh_CN.po
479 Ævar Arnfjörð Bjarmason (2):
480 git-svn: remove redundant porcelain option to rev-list
481 git-svn: un-break "git svn rebase" when log.abbrevCommit=true
484 Version v1.7.9.6; changes since v1.7.9.5:
485 -----------------------------------------
488 string-list: document that string_list_insert() inserts unique strings
491 merge: backport GIT_MERGE_AUTOEDIT support
495 Version v1.7.9.5; changes since v1.7.9.4:
496 -----------------------------------------
499 gitweb: Fix actionless dispatch for non-existent objects
502 fast-import: leakfix for 'ls' of dirty trees
503 fast-import: don't allow 'ls' of path with empty components
506 i18n of multi-line advice messages
510 t/Makefile: Use $(sort ...) explicitly where needed
513 grep doc: add --break / --heading / -W to synopsis
516 config: report errors at the EOL with correct line number
518 Nelson Benitez Leon (1):
519 documentation: fix alphabetic ordered list for git-rebase man page
522 rerere: Document 'rerere remaining'
524 Rodrigo Silva (MestreLion) (1):
525 Documentation: improve description of GIT_EDITOR and preference order
528 Version v1.7.9.4; changes since v1.7.9.3:
529 -----------------------------------------
532 gitweb: Fix fixed string (non-regexp) project search
535 am -3: allow nonstandard -p<num> option
536 test: "am -3" can accept non-standard -p<num>
537 t4011: modernise style
538 t4011: illustrate "diff-index -p" on stat-dirty paths
539 diff -p: squelch "diff --git" header for stat-dirty paths
543 t5510: refactor bundle->pack conversion
544 t5510: ensure we stay in the toplevel test dir
545 bundle: keep around names passed to add_pending_object()
546 Document the --histogram diff option
547 t5704: fix nonportable sed/grep usages
550 Version v1.7.9.3; changes since v1.7.9.2:
551 -----------------------------------------
554 rebase -m: only call "notes copy" when rewritten exists and is non-empty
556 Carlos Martín Nieto (2):
557 branch: don't assume the merge filter ref exists
558 Documentation: use {asterisk} in rev-list-options.txt when needed
560 Clemens Buchacher (1):
561 http.proxy: also mention https_proxy and all_proxy
564 Makefile: add thread-utils.h to LIB_H
567 gitweb: Fix "heads" view when there is no current branch
568 gitweb: Handle invalid regexp in regexp search
571 disconnect from remote helpers more gently
572 teach convert_to_git a "dry run" mode
573 teach dry-run convert_to_git not to require a src buffer
574 do not stream large files to pack when filters are in use
577 Ignore SIGPIPE when running a filter driver
580 am: don't infloop for an empty input file
582 John Szakmeister (1):
583 configure: don't use -lintl when there is no gettext support
586 mergetools/meld: Use --help output to detect --output support
589 refresh_index: do not show unmerged path that is outside pathspec
590 Documentation/merge-options.txt: group "ff" related options together
591 Document merge.branchdesc configuration variable
593 Document accumulated fixes since 1.7.9.2
594 Update draft release notes to 1.7.9.3
595 Documentation: do not assume that n > 1 in <rev>~$n
596 Update draft release notes to 1.7.9.3 for the last time
600 Documentation fixes in git-config
603 README: point to Documentation/SubmittingPatches
605 Michael Haggerty (2):
606 post-receive-email: remove unused variable
607 post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
609 Michael J Gruber (1):
610 t0300: work around bug in dash 0.5.6
612 Michał Kiedrowicz (1):
613 grep -P: Fix matching ^ and $
615 Nguyễn Thái Ngọc Duy (2):
616 rev-list: remove BISECT_SHOW_TRIED flag
617 rev-list: fix --verify-objects --quiet becoming --objects
620 git-p4: set useClientSpec variable on initial clone
621 git-p4: fix submit regression with clientSpec and subdir clone
622 git-p4: remove bash-ism in t9809
623 git-p4: remove bash-ism in t9800
625 Philip Jägenstedt (1):
626 remote: fix set-branches usage and documentation
628 Stefano Lattarini (1):
629 tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
632 merge: add instructions to the commit message when editing
633 bundle: put strbuf_readline_fd in strbuf.c with adjustments
634 bundle: use a strbuf to scan the log for boundary commits
635 strbuf: improve strbuf_get*line documentation
636 t5704: match tests to modern style
637 fast-import: zero all of 'struct tag' to silence valgrind
640 CodingGuidelines: Add a note about spaces after redirection
641 CodingGuidelines: do not use 'which' in shell scripts
644 t5512 (ls-remote): modernize style
647 Version v1.7.9.2; changes since v1.7.9.1:
648 -----------------------------------------
650 Christian Hammerl (1):
651 completion: Allow dash as the first character for __git_ps1
653 Clemens Buchacher (4):
654 git rev-list: fix invalid typecast
655 push/fetch/clone --no-progress suppresses progress output
656 t5541: check error message against the real port number used
657 do not override receive-pack errors
659 Felipe Contreras (3):
660 completion: work around zsh option propagation bug
661 completion: use ls -1 instead of rolling a loop to do that ourselves
662 completion: simplify __gitcomp and __gitcomp_nl implementations
665 gitweb: Allow UTF-8 encoded CGI query parameters and path_info
666 gitweb: Fix 'grep' search for multiple matches in file
669 grep: make locking flag global
670 grep: move sha1-reading mutex into low-level code
671 grep: refactor the concept of "grep source" into an object
672 convert git-grep to use grep_source interface
673 grep: drop grep_buffer's "name" parameter
674 grep: cache userdiff_driver in grep_source
675 grep: respect diff attributes for binary-ness
676 grep: load file data after checking binary-ness
677 grep: pre-load userdiff drivers when threaded
678 standardize and improve lookup rules for external local repos
679 prompt: clean up strbuf usage
680 prompt: fall back to terminal if askpass fails
683 i18n: git-commit whence_s "merge/cherry-pick" message
684 i18n: format_tracking_info "Your branch is behind" message
687 Makefile: fix syntax for older make
690 mailmap: always return a plain mail address from map_user()
691 git checkout -b: allow switching out of an unborn branch
692 commit: ignore intent-to-add entries instead of refusing
693 diff --stat: show bars of same length for paths with same amount of changes
694 Update draft release notes to 1.7.9.2
695 Update draft release notes to 1.7.9.2
696 Update draft release notes to 1.7.9.2
700 fsck: give accurate error message on empty loose object files
703 ctype.c only wants git-compat-util.h
704 ctype: implement islower/isupper macro
706 Nguyễn Thái Ngọc Duy (3):
707 sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
708 find_pack_entry(): do not keep packed_git pointer locally
709 Use correct grammar in diffstat summary line
711 Philip Jägenstedt (2):
712 completion: remove stale "to submit patches" documentation
713 completion: use tabs for indentation
716 completion: --edit-description option for git-branch
717 completion: --list option for git-branch
720 Fix build problems related to profile-directed optimization
722 Zbigniew Jędrzejewski-Szmek (2):
723 pager: find out the terminal width before spawning the pager
724 man: rearrange git synopsis to fit in 80 lines
727 Makefile: introduce CHARSET_LIB to link with -lcharset
730 Version v1.7.9.1; changes since v1.7.9:
731 ---------------------------------------
734 completion: --edit and --no-edit for git-merge
737 grep: fix -l/-L interaction with decoration lines
740 Drop system includes from inet_pton/inet_ntop compatibility wrappers
742 Clemens Buchacher (2):
743 fix push --quiet: add 'quiet' capability to receive-pack
744 dashed externals: kill children on exit
747 mergetool: Provide an empty file when needed
750 git.spec: Workaround localized messages not put in any RPM
753 run-command: optionally kill children on exit
754 imap-send: remove dead code
755 tag: fix output of "tag -n" when errors occur
756 tag: die when listing missing or corrupt objects
759 submodule add: fix breakage when re-adding a deep submodule
761 Johannes Schindelin (1):
762 add -e: do not show difference in a submodule that is merely dirty
765 server_supports(): parse feature list more carefully
766 Making pathspec limited log play nicer with --first-parent
767 request-pull: explicitly ask tags/$name to be pulled
768 tests: add write_script helper function
769 parse_date(): allow ancient git-timestamp
770 parse_date(): '@' prefix forces git-timestamp
771 merge: do not create a signed tag merge under --ff-only option
772 branch --edit-description: protect against mistyped branch name
775 tag: do not show non-tag contents with "-n"
776 merge: do not launch an editor on "--no-edit $tag"
777 Update draft release notes to 1.7.9.1
778 Update draft release notes to 1.7.9.1
781 Michael J Gruber (1):
782 t5541: avoid TAP test miscounting
784 Michael Palimaka (1):
785 Explicitly set X to avoid potential build breakage
788 remote-curl: Fix push status report when all branches fail
790 Ævar Arnfjörð Bjarmason (3):
791 Makefile: Change the default compiler from "gcc" to "cc"
792 Remove Git's support for smoke testing
793 t: use sane_unset instead of unset
796 Version v1.7.9; changes since v1.7.9-rc2:
797 -----------------------------------------
799 Felipe Contreras (1):
800 git-completion: workaround zsh COMPREPLY bug
803 docs: minor grammar fixes for v1.7.9 release notes
806 INSTALL: warn about recent Fedora breakage
809 Michael Haggerty (1):
810 Fix typo in 1.7.9 release notes
813 Version v1.7.9-rc2; changes since v1.7.9-rc1:
814 ---------------------------------------------
817 gitweb: Fix file links in "grep" search
818 gitweb: Harden "grep" search against filenames with ':'
821 unix-socket: handle long socket pathnames
822 credential-cache: report more daemon connection errors
823 credential-cache: ignore "connection refused" errors
826 unix-socket: do not let close() or chdir() clobber errno during cleanup
829 pulling signed tag: add howto document
834 Michael Haggerty (2):
835 git-show-ref: fix escaping in asciidoc source
836 git-show-ref doc: typeset regexp in fixed width font
838 Nguyễn Thái Ngọc Duy (3):
839 Document limited recursion pathspec matching with wildcards
840 diff-index: enable recursive pathspec matching in unpack_trees
841 diff-index: enable recursive pathspec matching in unpack_trees
844 word-diff: ignore '\ No newline at eof' marker
847 Version v1.7.9-rc1; changes since v1.7.9-rc0:
848 ---------------------------------------------
851 Use perl instead of sed for t8006-blame-textconv test
853 Carlos Martín Nieto (1):
854 archive: re-allow HEAD:Documentation on a remote invocation
856 Clemens Buchacher (1):
857 credentials: unable to connect to cache daemon
860 send-email: multiedit is a boolean config option
861 attr: don't confuse prefixes with leading directories
862 attr: drop misguided defensive coding
863 attr: fix leak in free_attr_elem
864 thin-pack: try harder to use preferred base objects as base
867 attr.c: make bootstrap_attr_stack() leave early
868 attr.c: clarify the logic to pop attr_stack
869 Documentation: rerere's rr-cache auto-creation and rerere.enabled
873 request-pull: use the real fork point when preparing the message
874 Update draft release notes to 1.7.6.6
875 Update draft release notes to 1.7.7.6
876 Update draft release notes to 1.7.8.4
880 gitweb: accept trailing "/" in $project_list
882 Michael Haggerty (3):
883 receive-pack: move more work into write_head_info()
884 show_ref(): remove unused "flag" and "cb_data" arguments
885 write_head_info(): handle "extra refs" locally
887 Nguyễn Thái Ngọc Duy (1):
888 t2203: fix wrong commit command
890 Sebastian Schuberth (2):
891 t9200: On MSYS, do not pass Windows-style paths to CVS
892 git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
895 mailinfo documentation: accurately describe non -k case
898 Version v1.7.9-rc0; changes since v1.7.8.5:
899 -------------------------------------------
902 gitk: Remove unused $cdate array
903 gitk: Remember time zones from author and commit timestamps
906 git-gui: fix multi selected file operation
907 git-gui: handle config booleans without value
908 git-gui: add smart case search mode in searchbar
909 git-gui: add regexp search mode to the searchbar
910 git-gui: add search history to searchbar
911 git-gui: fix unintended line break in message string
912 git-gui: use "untracked" for files which are not known to git
913 git-gui: new config to control staging of untracked files
914 git-gui: fix display of path in browser title
915 git-gui: use a tristate to control the case mode in the searchbar
916 git-gui: span widgets over the full file output area in the blame view
917 git-gui: include the file path in guitools confirmation dialog
918 git-gui: make config gui.warndetachedcommit a boolean
919 git-gui: don't warn for detached head when rebasing
922 git-gui: fix spelling error in sshkey.tcl
925 git-p4: ensure submit clientPath exists before chdir
926 git-p4: use absolute directory for PWD env var
927 git-p4: fix test for unsupported P4 Client Views
928 git-p4: sort client views by reverse View number
929 git-p4: support single file p4 client view maps
932 Add built-in diff patterns for MATLAB code
935 gitweb: Refactor diff body line classification
936 gitweb: Extract formatting of diff chunk header
937 gitweb: Give side-by-side diff extra CSS styling
938 t9500: Add test for handling incomplete lines in diff by gitweb
939 t9500: Add basic sanity tests for side-by-side diff in gitweb
940 gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
943 prune: handle --progress/no-progress
944 reachable: per-object progress
945 upload-archive: use start_command instead of fork
946 test-lib: add test_config_global variant
948 introduce credentials API
949 credential: add function for parsing url components
950 http: use credential API to get passwords
951 credential: apply helper config
952 credential: add credential.*.username
953 credential: make relevance of http path configurable
954 docs: end-user documentation for the credential subsystem
955 credentials: add "cache" helper
956 strbuf: add strbuf_add*_urlencode
957 imap-send: avoid buffer overflow
958 imap-send: don't check return value of git_getpass
959 move git_getpass to its own source file
960 refactor git_getpass into generic prompt function
961 add generic terminal prompt function
962 credentials: add "store" helper
963 prompt: use git_terminal_prompt
964 t: add test harness for external credential helpers
965 credential: use git_prompt instead of git_getpass
966 Makefile: linux has /dev/tty
967 Makefile: OS X has /dev/tty
968 contrib: add credential helper for OS X Keychain
969 test-lib: redirect stdin of tests
970 pretty: give placeholders to reflog identity
973 write first for-merge ref to FETCH_HEAD first
976 Makefile: unix sockets may not available on some platforms
977 t0090: be prepared that 'wc -l' writes leading blanks
980 gitk: Make vi-style keybindings more vi-like
981 test: add missing "&&" after echo command
982 test: remove a porcelain test that hard-codes commit names
983 t7501 (commit): modernize style
984 test: commit --amend should honor --no-edit
985 test: errors preparing for a test are not special
988 stash: Don't fail if work dir contains file named 'HEAD'
991 branch: add read_branch_desc() helper function
992 format-patch: use branch description in cover letter
993 branch: teach --edit-description option
994 request-pull: modernize style
995 request-pull: state what commit to expect
996 request-pull: use the branch description
997 fmt-merge-msg: use branch.$name.description
998 write_pack_header(): a helper function
999 create_tmp_packfile(): a helper function
1000 finish_tmp_packfile(): a helper function
1001 Split GPG interface into its own helper library
1002 merge: notice local merging of tags and keep it unwrapped
1003 fetch: allow "git fetch $there v1.0" to fetch a tag
1004 refs DWIMmery: use the same rule for both "git fetch" and others
1005 fmt-merge-msg: avoid early returns
1006 fmt-merge-msg: package options into a structure
1007 fmt-merge-msg: Add contents of merged tag in the merge message
1008 merge: make usage of commit->util more extensible
1009 merge: record tag objects without peeling in MERGE_HEAD
1010 request-pull: use the annotated tag contents
1011 commit: copy merged signed tags to headers of merge commit
1012 merge: force edit and no-ff mode when merging a tag object
1013 commit: teach --amend to carry forward extra headers
1014 commit-tree: update the command line parsing
1015 commit-tree: teach -m/-F options to read logs from elsewhere
1016 commit: teach --gpg-sign option
1017 log: --show-signature
1018 test "commit -S" and "log --show-signature"
1019 pretty: %G[?GS] placeholders
1020 gpg-interface: allow use of a custom GPG binary
1021 csum-file: introduce sha1file_checkpoint
1022 bulk-checkin: replace fast-import based implementation
1023 Kick-off the 1.7.9 cycle
1024 commit: honour --no-edit
1025 Update draft release notes for 1.7.9
1026 Update draft release notes to 1.7.9
1027 request-pull: update the "pull" command generation logic
1028 Update draft release notes to 1.7.9
1029 request-pull: do not emit "tag" before the tagname
1030 Update draft release notes to 1.7.9
1031 commit: do not lose mergetag header when not amending
1032 Update draft release notes to 1.7.9
1033 Update draft release notes in preparation for 1.7.9-rc0
1034 Update draft release notes to 1.7.9
1035 verify_signed_buffer: fix stale comment
1036 commit --amend -S: strip existing gpgsig headers
1037 log-tree.c: small refactor in show_signature()
1038 log-tree: show mergetag in log --show-signature output
1039 log --show-signature: reword the common two-head merge case
1043 gitweb: Add a feature to show side-by-side diff
1044 gitweb: Add navigation to select side-by-side diff
1046 Kirill A. Shutemov (1):
1047 git-tag: introduce --cleanup option
1050 fetch: do not store peeled tag object names in FETCH_HEAD
1052 Martin von Zweigbergk (10):
1053 gitk: Fix file highlight when run in subdirectory
1054 gitk: Fix "show origin of this line" with separate work tree
1055 gitk: Fix "blame parent commit" with separate work tree
1056 gitk: Fix "External diff" with separate work tree
1057 gitk: Put temporary directory inside .git
1058 gitk: Run 'git rev-parse --git-dir' only once
1059 gitk: Simplify calculation of gitdir
1060 gitk: Show modified files with separate work tree
1061 t3401: modernize style
1062 t3401: use test_commit in setup
1064 Michael Haggerty (16):
1065 struct ref_entry: document name member
1066 refs: rename "refname" variables
1067 refs: rename parameters result -> sha1
1068 clear_ref_array(): rename from free_ref_array()
1069 is_refname_available(): remove the "quiet" argument
1070 parse_ref_line(): add docstring
1071 add_ref(): add docstring
1072 is_dup_ref(): extract function from sort_ref_array()
1073 refs: change signatures of get_packed_refs() and get_loose_refs()
1074 get_ref_dir(): change signature
1075 resolve_gitlink_ref(): improve docstring
1076 Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
1077 resolve_gitlink_ref_recursive(): change to work with struct ref_cache
1078 repack_without_ref(): remove temporary
1079 create_ref_entry(): extract function from add_ref()
1080 add_ref(): take a (struct ref_entry *) parameter
1082 Nguyễn Thái Ngọc Duy (14):
1083 fsck: return error code when verify_pack() goes wrong
1084 verify_packfile(): check as many object as possible in a pack
1085 fsck: avoid reading every object twice
1086 fsck: print progress
1087 prune: show progress while marking reachable objects
1088 Convert many resolve_ref() calls to read_ref*() and ref_exists()
1089 checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
1090 Copy resolve_ref() return value for longer use
1091 revert: convert resolve_ref() to read_ref_full()
1092 Convert resolve_ref+xstrdup to new resolve_refdup function
1093 Rename resolve_ref() to resolve_ref_unsafe()
1094 merge: abort if fails to commit
1095 Convert commit_tree() to take strbuf as message
1096 commit_tree(): refuse commit messages that contain NULs
1099 git-gui: include the number of untracked files to stage when asking the user
1100 git-gui: theme the search and line-number entry fields on blame screen
1101 git-gui: catch invalid or complete regular expressions and treat as no match.
1102 git-gui: enable the smart case sensitive search only if gui.search.smartcase is true
1103 git-gui: set suitable extended window manager hints.
1104 git-gui: support underline style when parsing diff output
1105 git-gui: sort the numeric ansi codes
1106 git-gui: set whitespace warnings appropriate to this project
1107 git-gui: added config gui.gcwarning to disable the gc hint message
1108 git-gui: handle shell script text filters when loading for blame.
1112 gitk: Update copyright
1115 git-p4: introduce skipSubmitEdit
1116 git-p4: submit test for auto-creating clientPath
1117 git-p4: test for absolute PWD problem
1118 git-p4: fix skipSubmitEdit regression
1120 git-p4: introduce asciidoc documentation
1121 git-p4: clone does not use --git-dir
1122 git-p4: test cloning with two dirs, clarify doc
1123 git-p4: document and test clone --branch
1124 git-p4: honor --changesfile option and test
1125 git-p4: document and test --import-local
1126 git-p4: test --max-changes
1127 git-p4: test --keep-path
1128 git-p4: test and document --use-client-spec
1129 git-p4: document and test submit options
1130 git-p4: test client view handling
1131 git-p4: rewrite view handling
1132 git-p4: view spec documentation
1134 Ramkumar Ramachandra (11):
1135 t3200 (branch): fix '&&' chaining
1136 test: fix '&&' chaining
1137 t3030 (merge-recursive): use test_expect_code
1138 t1510 (worktree): fix '&&' chaining
1139 t3040 (subprojects-basic): fix '&&' chaining, modernize style
1140 revert: free msg in format_todo()
1141 revert: make commit subjects in insn sheet optional
1142 revert: tolerate extra spaces, tabs in insn sheet
1143 revert: simplify getting commit subject in format_todo()
1144 t3510 (cherry-pick-sequencer): use exit status
1145 t3502, t3510: clarify cherry-pick -m failure
1147 Ramsay Allan Jones (3):
1148 builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
1149 environment.c: Fix an sparse "symbol not declared" warning
1150 fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
1152 Raphael Zimmerer (1):
1153 gitk: When a commit contains a note, mark it with a yellow box
1156 read-cache.c: allocate index entries individually
1157 cache.h: put single NUL at end of struct cache_entry
1158 use struct sha1_array in diff_tree_combined()
1159 pass struct commit to diff_tree_combined_merge()
1160 submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
1163 completion: document __gitcomp()
1164 completion: optimize refs completion
1165 completion: make refs completion consistent for local and remote repos
1166 completion: improve ls-remote output filtering in __git_refs()
1167 completion: support full refs from remote repositories
1168 completion: query only refs/heads/ in __git_refs_remotes()
1169 completion: improve ls-remote output filtering in __git_refs_remotes()
1170 completion: fast initial completion for config 'remote.*.fetch' value
1171 completion: remove broken dead code from __git_heads() and __git_tags()
1174 git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.
1177 git-svn.perl: close the edit for propedits even with no mods
1180 Add test-scrap-cache-tree
1181 Test the current state of the cache-tree optimization
1182 Refactor cache_tree_update idiom from commit
1183 commit: write cache-tree data when writing index anyway
1184 reset: update cache-tree data when appropriate
1185 grep: load funcname patterns for -W
1186 grep: enable threading with -p and -W using lazy attribute lookup
1187 grep: disable threading in non-worktree case
1188 test-terminal: set output terminals to raw mode
1189 bash completion: use read -r everywhere
1192 git-gui: add config value gui.diffopts for passing additional diff options
1194 Vincent van Ravesteijn (4):
1195 Compile fix for MSVC: Do not include sys/resources.h
1196 Compile fix for MSVC: Include <io.h>
1197 MSVC: Remove unneeded header stubs
1198 Show error for 'git merge' with unset merge.defaultToUpstream
1201 gitk: Make "touching paths" search support backslashes
1203 Ævar Arnfjörð Bjarmason (5):
1204 pull: introduce a pull.rebase option to enable --rebase
1205 i18n: add infrastructure for translating Git with gettext
1206 Fix an enum assignment issue spotted by Sun Studio
1207 Fix a bitwise negation assignment issue spotted by Sun Studio
1208 Appease Sun Studio by renaming "tmpfile"
1211 Version v1.7.8.5; changes since v1.7.8.4:
1212 -----------------------------------------
1215 rebase -m: only call "notes copy" when rewritten exists and is non-empty
1217 Dmitry V. Levin (1):
1218 Makefile: add thread-utils.h to LIB_H
1221 imap-send: remove dead code
1224 am: don't infloop for an empty input file
1230 Michał Kiedrowicz (1):
1231 grep -P: Fix matching ^ and $
1234 Version v1.7.8.4; changes since v1.7.8.3:
1235 -----------------------------------------
1238 send-email: multiedit is a boolean config option
1239 attr: don't confuse prefixes with leading directories
1240 attr: drop misguided defensive coding
1241 attr: fix leak in free_attr_elem
1242 thin-pack: try harder to use preferred base objects as base
1244 Junio C Hamano (11):
1245 attr.c: make bootstrap_attr_stack() leave early
1246 attr.c: clarify the logic to pop attr_stack
1247 Documentation: rerere's rr-cache auto-creation and rerere.enabled
1251 Update draft release notes to 1.7.6.6
1252 Update draft release notes to 1.7.7.6
1253 Update draft release notes to 1.7.8.4
1257 Nguyễn Thái Ngọc Duy (2):
1258 t2203: fix wrong commit command
1259 diff-index: enable recursive pathspec matching in unpack_trees
1262 Version v1.7.8.3; changes since v1.7.8.2:
1263 -----------------------------------------
1266 fix hang in git fetch if pointed at a 0 length bundle
1268 Clemens Buchacher (2):
1269 Documentation: read-tree --prefix works with existing subtrees
1270 t5550: repack everything into one file
1273 Add MYMETA.json to perl/.gitignore
1276 gitweb: Fix fallback mode of to_utf8 subroutine
1279 docs: describe behavior of relative submodule URLs
1284 Jürgen Kreileder (3):
1285 gitweb: Call to_utf8() on input string in chop_and_escape_str()
1286 gitweb: esc_html() site name for title in OPML
1287 gitweb: Output valid utf8 in git_blame_common('data')
1289 Nguyễn Thái Ngọc Duy (1):
1290 Catch invalid --depth option passed to clone or fetch
1293 Documentation: rerere.enabled is the primary way to configure rerere
1296 Version v1.7.8.2; changes since v1.7.8.1:
1297 -----------------------------------------
1300 rebase -i: interrupt rebase when "commit --amend" failed during "reword"
1303 Update documentation for stripspace
1306 enable SO_KEEPALIVE for connected TCP sockets
1309 compat/setenv.c: update errno when erroring out
1310 compat/setenv.c: error if name contains '='
1313 read-cache: let refresh_cache_ent pass up changed flags
1314 refresh_index: rename format variables
1315 refresh_index: make porcelain output more specific
1316 compat/snprintf: don't look at va_list twice
1317 docs: mention "-k" for both forms of "git mv"
1318 mv: honor --verbose flag
1319 mv: make non-directory destination error more clear
1320 mv: improve overwrite warning
1321 mv: be quiet about overwriting
1322 drop "match" parameter from get_remote_heads
1323 t5500: give fully-qualified refs to fetch-pack
1324 fetch-pack: match refs exactly
1325 connect.c: drop path_match function
1326 t5540: test DAV push with authentication
1327 http-push: enable "proactive auth"
1328 use custom rename score during --follow
1329 docs: brush up obsolete bits of git-fsck manpage
1330 make "git push -v" actually verbose
1331 commit, merge: initialize static strbuf
1332 remote-curl: don't pass back fake refs
1334 Jelmer Vernooij (1):
1335 Fix an incorrect reference to --set-all.
1338 t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
1339 t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
1340 fast-import: Fix incorrect fanout level when modifying existing notes refs
1343 Compatibility: declare strtoimax() under NO_STRTOUMAX
1345 Jonathan Nieder (9):
1346 branch: allow a no-op "branch -M <current-branch> HEAD"
1347 Allow checkout -B <current-branch> to update the current branch
1348 revert: give --continue handling its own function
1349 revert: allow cherry-pick --continue to commit before resuming
1350 revert: pass around rev-list args in already-parsed form
1351 revert: allow single-pick in the middle of cherry-pick sequence
1352 revert: do not remove state until sequence is finished
1353 Revert "reset: Make reset remove the sequencer state"
1354 revert: stop creating and removing sequencer-old directory
1357 checkout -m: no need to insist on having all 3 stages
1358 checkout_merged(): squelch false warning from some gcc
1359 lf_to_crlf_filter(): resurrect CRLF->CRLF hack
1360 advice: Document that they all default to true
1364 Add strtoimax() compatibility function.
1365 Support sizes >=2G in various config options accepting 'g' sizes.
1368 Test 'checkout -m -- path'
1371 imap-send: Remove unused 'use_namespace' variable
1374 git-sh-setup: make require_clean_work_tree part of the interface
1376 Ævar Arnfjörð Bjarmason (1):
1377 t/t2023-checkout-m.sh: fix use of test_must_fail
1380 Version v1.7.8.1; changes since v1.7.8:
1381 ---------------------------------------
1384 t/t4131-apply-fake-ancestor.sh: fix broken test
1385 builtin/apply.c: report error on failure to recognize input
1387 Carlos Martín Nieto (2):
1388 convert: track state in LF-to-CRLF filter
1389 clone: the -o option has nothing to do with <branch>
1392 mingw: give waitpid the correct signature
1395 Documentation: fix formatting error in merge-options.txt
1398 http: drop "local" member from request struct
1399 archive: don't let remote clients get unreachable commits
1400 stripspace: fix outdated comment
1401 fetch: create status table using strbuf
1402 blame: don't overflow time buffer
1405 diff/status: print submodule path when looking for changes fails
1408 get_tree_entry(): do not call find_tree_entry() on an empty tree
1409 unpack_object_header_buffer(): clear the size field upon error
1410 receive-pack, fetch-pack: reject bogus pack that records objects twice
1411 pack-object: tolerate broken packs that have duplicated objects
1414 Update draft release notes for 1.7.8.1
1415 lf_to_crlf_filter(): tell the caller we added "\n" when draining
1418 Martin von Zweigbergk (1):
1419 am: don't persist keepcr flag
1421 Michael Haggerty (1):
1422 git symbolic-ref: documentation fix
1424 Michael Schubert (2):
1425 builtin/commit: add missing '/' in help message
1426 builtin/log: remove redundant initialization
1429 http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
1430 http.c: Use timeout suggested by curl instead of fixed 50ms timeout
1431 http.c: Rely on select instead of tracking whether data was received
1433 Nguyễn Thái Ngọc Duy (5):
1434 tree-walk.c: do not leak internal structure in tree_entry_len()
1435 read_directory_recursive: reduce one indentation level
1436 tree_entry_interesting(): give meaningful names to return values
1437 tree_entry_interesting: make use of local pointer "item"
1438 checkout,merge: loosen overwriting untracked file check based on info/exclude
1441 Add MYMETA.yml to perl/.gitignore
1444 userdiff: allow * between cpp funcname words
1446 Ævar Arnfjörð Bjarmason (3):
1447 apply: get rid of useless x < 0 comparison on a size_t type
1448 cast variable in call to free() in builtin/diff.c and submodule.c
1449 builtin/init-db.c: eliminate -Wformat warning on Solaris
1452 Version v1.7.8; changes since v1.7.8-rc4:
1453 -----------------------------------------
1459 Version v1.7.8-rc4; changes since v1.7.8-rc3:
1460 ---------------------------------------------
1463 Fix revert --abort on Windows
1465 Jonathan Nieder (11):
1466 do not let git_path clobber errno when reporting errors
1467 notes merge: eliminate OUTPUT macro
1468 Makefile: add missing header file dependencies
1469 Makefile: add option to disable automatic dependency generation
1470 revert: rename --reset option to --quit
1471 revert: rearrange pick_revisions() for clarity
1472 revert: improve error message for cherry-pick during cherry-pick
1473 revert: write REVERT_HEAD pseudoref during conflicted revert
1474 revert: introduce --abort to cancel a failed cherry-pick
1475 revert: remove --reset compatibility option
1476 revert --abort: do not leave behind useless sequencer-old directory
1479 name-rev --all: do not even attempt to describe non-commit object
1481 Hopefully final update of release notes before 1.7.8 final
1482 Update 1.7.8 draft release notes in preparation for rc4
1485 Marc-André Lureau (1):
1486 mailmap: xcalloc mailmap_info
1488 Nguyễn Thái Ngọc Duy (1):
1489 revert: do not pass non-literal string as format to git_path()
1491 Ramkumar Ramachandra (4):
1492 http: remove unused function hex()
1493 convert: don't mix enum with int
1494 sha1_file: don't mix enum with int
1495 git-compat-util: don't assume value for undefined variable
1497 Ramsay Allan Jones (3):
1498 t5501-*.sh: Fix url passed to clone in setup test
1499 config.c: Fix a static buffer overwrite bug by avoiding mkpath()
1500 convert.c: Fix return type of git_path_check_eol()
1502 Thomas Hochstein (1):
1503 documentation fix: git difftool uses diff tools, not merge tools.
1505 Vincent van Ravesteijn (2):
1506 builtin-branch: Fix crash on invalid use of --force
1507 builtin-reset: Documentation update
1510 Version v1.7.8-rc3; changes since v1.7.8-rc2:
1511 ---------------------------------------------
1514 Revert "upload-archive: use start_command instead of fork"
1515 refs: loosen over-strict "format" check
1518 Ramkumar Ramachandra (1):
1519 revert: prettify fatal messages
1522 Version v1.7.8-rc2; changes since v1.7.8-rc1:
1523 ---------------------------------------------
1525 Felipe Contreras (1):
1526 remote: fix remote set-url usage
1529 docs: don't mention --quiet or --exit-code in git-log(1)
1532 remote: fix set-branches usage
1533 docs: Update install-doc-quick
1535 Update draft release notes to 1.7.8
1539 mktree: fix a memory leak in write_tree()
1542 completion: don't leak variable from the prompt into environment
1545 Version v1.7.8-rc1; changes since v1.7.8-rc0:
1546 ---------------------------------------------
1549 pack-objects: mark add_to_write_order() as inline
1550 pack-objects: use unsigned int for counter and offset values
1551 pack-objects: rewrite add_descendants_to_write_order() iteratively
1552 pack-objects: don't traverse objects unnecessarily
1555 mingw: move poll out of sys-folder
1556 compat/win32/poll.c: upgrade from upstream
1557 upload-archive: use start_command instead of fork
1558 mingw: poll.h is no longer in sys/
1561 name-hash.c: always initialize dir_next pointer
1564 (squash) test for previous
1566 Update draft release notes to 1.7.8
1567 receive-pack: do not expect object 0{40} to exist
1570 Nguyễn Thái Ngọc Duy (2):
1571 pretty.c: free get_header() return value
1572 pretty.c: use original commit message if reencoding fails
1575 t7511: avoid use of reserved filename on Windows.
1578 git-p4: ignore apple filetype
1580 Sebastian Schuberth (2):
1581 blame.c: Properly initialize strbuf after calling, textconv_object()
1582 blame.c: Properly initialize strbuf after calling textconv_object(), again
1585 t3200: add test case for 'branch -m'
1586 http: don't always prompt for password
1589 branch -m: handle no arg properly
1592 svn: Quote repository root in regex match
1594 Ævar Arnfjörð Bjarmason (2):
1595 t/t6030-bisect-porcelain.sh: use test_i18ngrep
1596 t/t7508-status.sh: use test_i18ncmp
1599 Version v1.7.8-rc0; changes since v1.7.7.6:
1600 -------------------------------------------
1603 grep: do not use --index in the short usage output
1604 grep --no-index: don't use git standard exclusions
1605 git-gui: search and linenumber input are mutual exclusive in the blame view
1606 git-gui: only accept numbers in the goto-line input
1607 git-gui: clear the goto line input when hiding
1608 git-gui: incremental goto line in blame view
1609 grep: fix the error message that mentions --exclude
1612 submodule: Demonstrate known breakage during recursive merge
1613 submodule: Search for merges only at end of recursive merge
1616 t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
1617 git-stash.sh: fix typo in error message
1618 t/t3905: add missing '&&' linkage
1619 git-stash: remove untracked/ignored directories when stashed
1620 refs.c: ensure struct whose member may be passed to realloc is initialized
1621 refs.c: abort ref search if ref array is empty
1622 refs.c: free duplicate entries in the ref array instead of leaking them
1623 t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script
1625 Carlos Martín Nieto (1):
1626 Documentation: update [section.subsection] to reflect what git does
1629 git-web--browse: avoid the use of eval
1631 Christoffer Pettersson (1):
1632 git-gui: Corrected a typo in the Swedish translation of 'Continue'
1634 Clemens Buchacher (5):
1635 remove prefix argument from pathspec_prefix
1636 rename pathspec_prefix() to common_prefix() and move to dir.[ch]
1637 send-email: add option -h
1638 use -h for synopsis and --help for manpage consistently
1639 use test number as port number
1642 Add Git::config_path()
1643 use new Git::config_path() for aliasesfile
1644 send-email: Fix %config_path_settings handling
1647 tree-walk: drop unused parameter from match_dir_prefix
1648 tree-walk: micro-optimization in tree_entry_interesting
1651 Makefile: Improve compiler header dependency check
1654 git-gui: Enable jumping to a specific line number in blame view.
1655 git-gui: Add keyboard shortcuts for search and goto commands in blame view.
1658 Fix typo: existant->existent
1659 fast-import: don't allow to tag empty branch
1660 fast-import: don't allow to note on empty branch
1663 gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
1666 enter_repo: do not modify input
1667 mingw: avoid using strbuf in syslog
1669 Fredrik Gustafsson (2):
1670 rev-parse: add option --resolve-git-dir <path>
1671 Move git-dir for submodules
1673 Fredrik Kuivinen (1):
1674 Makefile: Use computed header dependencies if the compiler supports it
1676 Frédéric Heitzmann (1):
1677 git svn dcommit: new option --interactive.
1679 Giuseppe Bilotta (1):
1680 am: preliminary support for hg patches
1683 git-gui: warn when trying to commit on a detached head
1684 submodule: move update configuration variable further up
1685 add update 'none' flag to disable update of submodule by default
1686 git-gui: deal with unknown files when pressing the "Stage Changed" button
1689 sha1_file: normalize alt_odb path before comparing and storing
1692 gitweb: Add gitweb(1) manpage for gitweb itself
1693 Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
1694 Documentation: Add gitweb config variables to git-config(1)
1695 gitweb: Add gitweb manpages to 'gitweb' package in git.spec
1696 Add simple test for Git::config_path() in t/t9700-perl-git.sh
1699 Teach '--cached' option to check-attr
1701 revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
1702 cherry-pick: do not give irrelevant advice when cherry-pick punted
1703 Teach merge the '[-e|--edit]' option
1706 url: decode buffers that are not NUL-terminated
1707 improve httpd auth tests
1708 remote-curl: don't retry auth failures with dumb protocol
1709 http: retry authentication failures for all http requests
1710 t7004: factor out gpg setup
1711 t6300: add more body-parsing tests
1712 for-each-ref: refactor subject and body placeholder parsing
1713 for-each-ref: handle multiline subjects like --pretty
1714 t3200: clean up checks for file existence
1715 fix phantom untracked files when core.ignorecase is set
1716 t1300: put git invocations inside test function
1717 t1300: test mixed-case variable retrieval
1718 pack-objects: protect against disappearing packs
1719 downgrade "packfile cannot be accessed" errors to warnings
1720 daemon: give friendlier error messages to clients
1721 http_init: accept separate URL parameter
1722 contrib: add diff highlight script
1723 tests: add missing executable bits
1724 contrib: add git-jump script
1725 completion: match ctags symbol names in grep patterns
1728 Add a remote helper to interact with mediawiki (fetch & push)
1730 Johannes Schindelin (5):
1731 Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile
1732 t1020: disable the pwd test on MinGW
1733 t9001: do not fail only due to CR/LF issues
1734 t9300: do not run --cat-blob-fd related tests on MinGW
1735 git grep: be careful to use mutexes only when they are initialized
1738 t1402-check-ref-format: skip tests of refs beginning with slash on Windows
1739 t1300: attempting to remove a non-existent .git/config is not an error
1741 Jonathan Nieder (3):
1742 ident: check /etc/mailname if email is unknown
1743 ident: do not retrieve default ident when unnecessary
1744 Makefile: fix permissions of mergetools/ checked out with permissive umask
1746 Julian Phillips (2):
1747 Don't sort ref_list too early
1748 refs: Use binary search to lookup refs faster
1750 Junio C Hamano (47):
1751 rev-list: fix finish_object() call
1752 revision.c: add show_object_with_name() helper function
1753 revision.c: update show_object_with_name() without using malloc()
1754 list-objects: pass callback data to show_objects()
1755 rev-list --verify-object
1756 fetch: verify we have everything we need before updating our ref
1757 fetch.fsckobjects: verify downloaded objects
1758 transfer.fsckobjects: unify fetch/receive.fsckobjects
1759 test: fetch/receive with fsckobjects
1760 consolidate pathspec_prefix and common_prefix
1761 fetch: verify we have everything we need before updating our ref
1762 check_everything_connected(): refactor to use an iterator
1763 check_everything_connected(): libify
1764 receive-pack: check connectivity before concluding "git push"
1765 builtin/revert.c: make commit_list_append() static
1766 refs.c: make create_cached_refs() static
1767 send-pack: typofix error message
1768 rename "match_refs()" to "match_push_refs()"
1769 Allow git merge ":/<pattern>"
1770 ls-remote: a lone "-h" is asking for help
1771 t0003: remove extra whitespaces
1772 parse-options: deprecate OPT_BOOLEAN
1773 archive.c: use OPT_BOOL()
1774 url.c: simplify is_url()
1775 grep: teach --untracked and --exclude-standard options
1776 Post 1.7.7 first wave
1777 Update draft release notes to 1.7.8
1778 refs.c: move dwim_ref()/dwim_log() from sha1_name.c
1779 Update draft release notes to 1.7.8
1780 bundle: allowing to read from an unseekable fd
1781 bundle: add parse_bundle_header() helper function
1782 Update draft release notes to 1.7.8
1783 t7800: avoid arithmetic expansion notation
1784 Update draft release notes to 1.7.8
1785 resolve_gitlink_packed_ref(): fix mismerge
1786 Update draft release notes to 1.7.8
1787 Makefile: ask "ls-files" to list source files if available
1788 libperl-git: refactor Git::config_*
1789 Update draft release notes to 1.7.8
1790 resolve_ref(): expose REF_ISBROKEN flag
1791 resolve_ref(): report breakage to the caller without warning
1792 Update draft release notes to 1.7.8
1793 builtin/grep: make lock/unlock into static inline functions
1794 builtin/grep: simplify lock_and_read_sha1_file()
1795 Update draft release notes to 1.7.8
1796 Update draft release notes to 1.7.8
1800 git-p4: handle files with shell metacharacters
1803 gitweb: provide a way to customize html headers
1806 git-remote-mediawiki: allow push to set MediaWiki metadata
1807 git-remote-mediawiki: trivial fixes
1808 git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
1809 git-remote-mediawiki: obey advice.pushNonFastForward
1810 git-remote-mediawiki: allow a domain to be set for authentication
1811 git-remote-mediawiki: don't include HTTP login/password in author
1813 Michael Haggerty (36):
1814 Extract a function clear_cached_refs()
1815 Access reference caches only through new function get_cached_refs()
1816 Change the signature of read_packed_refs()
1817 Allocate cached_refs objects dynamically
1818 Store the submodule name in struct cached_refs
1819 Retain caches of submodule refs
1820 get_sha1_hex(): do not read past a NUL character
1821 t1402: add some more tests
1822 git check-ref-format: add options --allow-onelevel and --refspec-pattern
1823 Change bad_ref_char() to return a boolean value
1824 Change check_ref_format() to take a flags argument
1825 Refactor check_refname_format()
1826 Do not allow ".lock" at the end of any refname component
1827 Make collapse_slashes() allocate memory for its result
1828 Inline function refname_format_print()
1829 Change check_refname_format() to reject unnormalized refnames
1830 resolve_ref(): explicitly fail if a symlink is not readable
1831 resolve_ref(): use prefixcmp()
1832 resolve_ref(): only follow a symlink that contains a valid, normalized refname
1833 resolve_ref(): turn buffer into a proper string as soon as possible
1834 resolve_ref(): extract a function get_packed_ref()
1835 resolve_ref(): do not follow incorrectly-formatted symbolic refs
1836 remote: use xstrdup() instead of strdup()
1837 remote: avoid passing NULL to read_ref()
1838 resolve_ref(): verify that the input refname has the right format
1839 resolve_ref(): emit warnings for improperly-formatted references
1840 resolve_ref(): also treat a too-long SHA1 as invalid
1841 resolve_ref(): expand documentation
1842 add_ref(): verify that the refname is formatted correctly
1843 invalidate_ref_cache(): rename function from invalidate_cached_refs()
1844 invalidate_ref_cache(): take the submodule as parameter
1845 invalidate_ref_cache(): expose this function in the refs API
1846 clear_ref_cache(): rename parameter
1847 clear_ref_cache(): extract two new functions
1848 write_ref_sha1(): only invalidate the loose ref cache
1849 clear_ref_cache(): inline function
1851 Michael J Gruber (7):
1852 t6040: test branch -vv
1853 git-tag: introduce long forms for the options
1854 git-branch: introduce missing long forms for the options
1855 branch: introduce --list option
1856 branch: allow pattern arguments
1857 branch: -v does not automatically imply --list
1858 http: use hostname in credential description
1860 Michael W. Olson (1):
1861 git-svn: Allow certain refs to be ignored
1864 for-each-ref: add split message parts to %(contents:*).
1866 Nguyễn Thái Ngọc Duy (6):
1867 sparse checkout: show error messages when worktree shaping fails
1868 Add explanation why we do not allow to sparse checkout to empty working tree
1869 pack-protocol: document "ERR" line
1870 daemon: return "access denied" if a service is not allowed
1871 daemon: log errors if we could not use some sockets
1872 t5403: convert leading spaces to tabs
1875 receive-pack: don't pass non-existent refs to post-{receive,update} hooks
1878 git-gui: updated translator README for current procedures.
1879 Fix tooltip display with multiple monitors on windows.
1880 git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.
1881 mergetools: use the correct tool for Beyond Compare 3 on Windows
1882 mingw: ensure sockets are initialized before calling gethostname
1883 t9901: fix line-ending dependency on windows
1886 git-p4 tests: refactor and cleanup
1887 git-p4: handle utf16 filetype properly
1888 git-p4: recognize all p4 filetypes
1889 git-p4: stop ignoring apple filetype
1890 git-p4: keyword flattening fixes
1892 Peter Oberndorfer (1):
1893 "rebase -i": support special-purpose editor to edit insn sheet
1896 Learn to handle gitfiles in enter_repo
1897 Teach transport about the gitfile mechanism
1898 Add test showing git-fetch groks gitfiles
1900 Ramkumar Ramachandra (18):
1901 advice: Introduce error_resolve_conflict
1902 config: Introduce functions to write non-standard file
1903 revert: Simplify and inline add_message_to_msg
1904 revert: Don't check lone argument in get_encoding
1905 revert: Rename no_replay to record_origin
1906 revert: Eliminate global "commit" variable
1907 revert: Introduce struct to keep command-line options
1908 revert: Separate cmdline parsing from functional code
1909 revert: Don't create invalid replay_opts in parse_args
1910 revert: Save data for continuing after conflict resolution
1911 revert: Save command-line options for continuing operation
1912 revert: Make pick_commits functionally act on a commit list
1913 revert: Introduce --reset to remove sequencer state
1914 reset: Make reset remove the sequencer state
1915 revert: Remove sequencer state when no commits are pending
1916 revert: Don't implicitly stomp pending sequencer operation
1917 revert: Introduce --continue to continue the operation
1918 revert: Propagate errors upwards from do_pick_commit
1920 Ramsay Allan Jones (5):
1921 Makefile: Make dependency directory creation less noisy
1922 sparse: Fix an "Using plain integer as NULL pointer" warning
1923 obstack.c: Fix some sparse warnings
1924 Fix some "variable might be used uninitialized" warnings
1925 gitweb/Makefile: Remove static/gitweb.js in the clean target
1928 parseopt: add OPT_NOOP_NOARG
1929 revert: use OPT_NOOP_NOARG
1930 apply: use OPT_NOOP_NOARG
1931 checkout: check for "Previous HEAD" notice in t2020
1932 revision: factor out add_pending_sha1
1933 checkout: use add_pending_{object,sha1} in orphan check
1934 revision: add leak_pending flag
1935 bisect: use leak_pending flag
1936 bundle: use leak_pending flag
1937 checkout: use leak_pending flag
1938 commit: factor out clear_commit_marks_for_object_array
1940 test-ctype: add test for is_pathspec_magic
1941 name-rev: split usage string
1942 pickaxe: plug diff filespec leak with empty needle
1943 pickaxe: plug regex leak
1944 pickaxe: plug regex/kws leak
1945 pickaxe: factor out has_changes
1946 pickaxe: pass diff_options to contains and has_changes
1947 pickaxe: give diff_grep the same signature as has_changes
1948 pickaxe: factor out pickaxe
1949 xdiff: factor out get_func_line()
1950 diff: add option to show whole functions as context
1953 completion: unite --reuse-message and --reedit-message for 'notes'
1954 completion: unite --format and --pretty for 'log' and 'show'
1956 Sebastian Schuberth (2):
1957 git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
1958 inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
1960 Sitaram Chamarty (1):
1961 git-difftool: allow skipping file by typing 'n' at prompt
1964 completion: fix issue with process substitution not working on Git for Windows
1967 fetch: plug two leaks on error exit in store_updated_refs
1968 submodule: whitespace fix
1969 submodule::module_clone(): silence die() message from module_name()
1971 Teemu Matilainen (3):
1972 completion: unite --reuse-message and --reedit-message handling
1973 completion: commit --fixup and --squash
1974 completion: push --set-upstream
1976 Zbigniew Jędrzejewski-Szmek (1):
1977 send-email: auth plain/login fix
1980 Version v1.7.7.6; changes since v1.7.7.5:
1981 -----------------------------------------
1983 Clemens Buchacher (1):
1984 Documentation: read-tree --prefix works with existing subtrees
1987 Add MYMETA.json to perl/.gitignore
1990 attr: don't confuse prefixes with leading directories
1991 attr: drop misguided defensive coding
1992 attr: fix leak in free_attr_elem
1993 thin-pack: try harder to use preferred base objects as base
1996 docs: describe behavior of relative submodule URLs
1999 attr.c: make bootstrap_attr_stack() leave early
2000 attr.c: clarify the logic to pop attr_stack
2001 Documentation: rerere's rr-cache auto-creation and rerere.enabled
2004 Update draft release notes to 1.7.6.6
2005 Update draft release notes to 1.7.7.6
2008 Nguyễn Thái Ngọc Duy (2):
2009 t2203: fix wrong commit command
2010 diff-index: enable recursive pathspec matching in unpack_trees
2013 Documentation: rerere.enabled is the primary way to configure rerere
2016 Version v1.7.7.5; changes since v1.7.7.4:
2017 -----------------------------------------
2020 mingw: give waitpid the correct signature
2023 stripspace: fix outdated comment
2024 fetch: create status table using strbuf
2025 blame: don't overflow time buffer
2031 Martin von Zweigbergk (1):
2032 am: don't persist keepcr flag
2034 Michael Haggerty (1):
2035 git symbolic-ref: documentation fix
2037 Nguyễn Thái Ngọc Duy (1):
2038 checkout,merge: loosen overwriting untracked file check based on info/exclude
2041 Add MYMETA.yml to perl/.gitignore
2043 Thomas Hochstein (1):
2044 documentation fix: git difftool uses diff tools, not merge tools.
2046 Ævar Arnfjörð Bjarmason (2):
2047 apply: get rid of useless x < 0 comparison on a size_t type
2048 cast variable in call to free() in builtin/diff.c and submodule.c
2051 Version v1.7.7.4; changes since v1.7.7.3:
2052 -----------------------------------------
2054 Jonathan Nieder (2):
2055 notes merge: eliminate OUTPUT macro
2056 Makefile: add missing header file dependencies
2059 name-rev --all: do not even attempt to describe non-commit object
2062 Marc-André Lureau (1):
2063 mailmap: xcalloc mailmap_info
2066 Version v1.7.7.3; changes since v1.7.7.2:
2067 -----------------------------------------
2070 pack-objects: mark add_to_write_order() as inline
2071 pack-objects: use unsigned int for counter and offset values
2072 pack-objects: rewrite add_descendants_to_write_order() iteratively
2073 pack-objects: don't traverse objects unnecessarily
2076 docs: don't mention --quiet or --exit-code in git-log(1)
2078 Julien Muchembled (1):
2079 gitweb: fix regression when filtering out forks
2082 branch -m/-M: remove undocumented RENAMED-REF
2083 docs: Update install-doc-quick
2087 Version v1.7.7.2; changes since v1.7.7.1:
2088 -----------------------------------------
2091 attr.c: avoid inappropriate access to strbuf "buf" member
2092 cleanup: use internal memory allocation wrapper functions everywhere
2093 builtin/mv.c: plug miniscule memory leak
2094 attr.c: respect core.ignorecase when matching attribute patterns
2096 Carlos Martín Nieto (6):
2097 Remove 'working copy' from the documentation and C code
2098 fetch: free all the additional refspecs
2099 t5510: add tests for fetch --prune
2100 remote: separate out the remote_find_tracking logic into query_refspecs
2101 fetch: honor the user-provided refspecs when pruning refs
2102 fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
2104 Christian Couder (1):
2105 bisect: fix exiting when checkout failed in bisect_start()
2108 date.c: Support iso8601 timezone formats
2111 gitweb: Strip non-printable characters from syntax highlighter output
2114 add sha1_array API docs
2115 quote.h: fix bogus comment
2116 refactor argv_array into generic code
2117 quote: provide sq_dequote_to_argv_array
2118 bisect: use argv_array API
2119 checkout: use argv_array API
2120 run_hook: use argv_array API
2121 pull,rebase: handle GIT_WORK_TREE better
2124 make the sample pre-commit hook script reject names with newlines, too
2126 Jonathan Nieder (2):
2127 http: remove extra newline in error message
2128 http: avoid empty error messages for some curl errors
2131 mergetool: Use args as pathspec to unmerged files
2134 refactor run_receive_hook()
2135 diff: teach --stat/--numstat to honor -U$num
2136 mergetool: no longer need to save standard input
2137 attr: read core.attributesfile from git_default_core_config
2140 Martin von Zweigbergk (4):
2141 remote: write correct fetch spec when renaming remote 'remote'
2142 remote: "rename o foo" should not rename ref "origin/bar"
2143 remote rename: warn when refspec was not updated
2144 remote: only update remote-tracking branch if updating refspec
2147 send-email: Honour SMTP domain when using TLS
2149 Michael Haggerty (1):
2150 notes_merge_commit(): do not pass temporary buffer to other function
2152 Michael J Gruber (3):
2153 unpack-trees: print "Aborting" to stderr
2154 git-read-tree.txt: language and typography fixes
2155 git-read-tree.txt: correct sparse-checkout and skip-worktree description
2157 Nguyễn Thái Ngọc Duy (2):
2158 git-read-tree.txt: update sparse checkout examples
2159 Reindent closing bracket using tab instead of spaces
2162 t7511: avoid use of reserved filename on Windows.
2165 gitweb: Fix links to lines in blobs when javascript-actions are enabled
2167 Ramsay Allan Jones (1):
2168 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
2171 read-cache.c: fix index memory allocation
2173 Richard Hartmann (1):
2174 clone: Quote user supplied path in a single quote pair
2176 Shawn O. Pearce (1):
2177 remote-curl: Fix warning after HTTP failure
2180 Documentation/git-update-index: refer to 'ls-files'
2183 Documentation: basic configuration of notes.rewriteRef
2186 Version v1.7.7.1; changes since v1.7.7:
2187 ---------------------------------------
2190 rev-list: Demonstrate breakage with --ancestry-path --all
2193 strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()
2195 Ilari Liusvaara (1):
2196 Support ERR in remote archive like in fetch/push
2199 merge-one-file: fix "expr: non-numeric argument"
2202 fetch: avoid quadratic loop checking for updated submodules
2203 filter-branch: use require_clean_work_tree
2206 fix "git apply --index ..." not to deref NULL
2208 Jonathan Nieder (2):
2209 Makefile: do not set setgid bit on directories on GNU/kFreeBSD
2210 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
2212 Junio C Hamano (14):
2213 revision: keep track of the end-user input from the command line
2214 revision: do not include sibling history in --ancestry-path output
2215 rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
2216 traverse_trees(): allow pruning with pathspec
2217 unpack-trees: allow pruning with pathspec
2218 diff-index: pass pathspec down to unpack-trees machinery
2219 fsck: do not abort upon finding an empty blob
2220 Teach progress eye-candy to fetch_refs_from_bundle()
2221 apply --whitespace=error: correctly report new blank lines at end
2222 checkout $tree $path: do not clobber local changes in $path not in $tree
2223 diff: resurrect XDF_NEED_MINIMAL with --minimal
2225 Almost ready for 1.7.7.1
2229 rebase -i: clean error message for --continue after failed exec
2230 config: display key_delim for config --bool --get-regexp
2232 Michael Schubert (1):
2233 patch-id.c: use strbuf instead of a fixed buffer
2235 Nguyễn Thái Ngọc Duy (4):
2236 merge: keep stash[] a local variable
2237 merge: use return value of resolve_ref() to determine if HEAD is invalid
2238 merge: remove global variable head[]
2239 Accept tags in HEAD or MERGE_HEAD
2241 Nicolas Morey-Chaisemartin (1):
2242 grep: Fix race condition in delta_base_cache
2245 Revert removal of multi-match discard heuristic in 27af01
2246 t1304: fall back to $USER if $LOGNAME is not defined
2249 Symlink mergetools scriptlets into valgrind wrappers
2250 t6019: avoid refname collision on case-insensitive systems
2253 Version v1.7.7; changes since v1.7.7-rc3:
2254 -----------------------------------------
2257 contrib/hooks: adapt comment about Debian install location for contrib hooks
2258 templates/hooks--*: remove sample hooks without any functionality
2261 Documentation/gitnamespaces.txt: cater to older asciidoc
2265 Version v1.7.7-rc3; changes since v1.7.7-rc2:
2266 ---------------------------------------------
2269 describe: Refresh the index when run with --dirty
2272 git-mergetool: check return value from read
2275 t4014: clean up format.thread config after each test
2279 merge-recursive: Do not look at working tree during a virtual ancestor merge
2283 Version v1.7.7-rc2; changes since v1.7.7-rc1:
2284 ---------------------------------------------
2287 git-svn: teach git-svn to populate svn:mergeinfo
2289 Frédéric Heitzmann (1):
2290 Disambiguate duplicate t9160* tests
2293 branch --set-upstream: regression fix
2297 format-patch: ignore ui.color
2300 Version v1.7.7-rc1; changes since v1.7.7-rc0:
2301 ---------------------------------------------
2304 Documentation: Grammar correction, wording fixes and cleanup
2305 Mark http-fetch without -a as deprecated
2308 t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
2310 Brian Gernhardt (1):
2311 t5540-http-test: shorten grep pattern
2314 git-svn: Teach dcommit --mergeinfo to handle multiple lines
2317 Prevent force-updating of the current branch
2318 Show interpreted branch name in error messages
2320 Dmitry Ivankov (11):
2321 fast-import: add input format tests
2322 fast-import: don't fail on omitted committer name
2323 fast-import: check committer name more strictly
2324 fsck: add a few committer name tests
2325 fsck: improve committer/author check
2326 fast-import: add a test for tree delta base corruption
2327 fast-import: prevent producing bad delta
2328 fast-import: count and report # of calls to diff_delta in stats
2329 fast-import: treat cat-blob as a delta base hint for next blob
2330 fast-import: add tests for tagging blobs
2331 fast-import: allow to tag newly created objects
2334 t6042: Add a testcase where git deletes an untracked file
2335 t6042: Add failing testcase for rename/modify/add-source conflict
2336 t6042: Add a pair of cases where undetected renames cause issues
2337 t6042: Add a testcase where undetected rename causes silent file deletion
2338 t6042: Add tests for content issues with modify/rename/directory conflicts
2339 t6042: Ensure rename/rename conflicts leave index and workdir in sane state
2340 t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
2341 t6036: Add differently resolved modify/delete conflict in criss-cross test
2342 t6036: criss-cross with weird content can fool git into clean merge
2343 t6036: tests for criss-cross merges with various directory/file conflicts
2344 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
2345 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
2346 t6022: Remove unnecessary untracked files to make test cleaner
2347 t6022: New tests checking for unnecessary updates of files
2348 t6022: Add testcase for merging a renamed file with a simple change
2349 merge-recursive: Make BUG message more legible by adding a newline
2350 merge-recursive: Correct a comment
2351 merge-recursive: Mark some diff_filespec struct arguments const
2352 merge-recursive: Consolidate different update_stages functions
2353 merge-recursive: Remember to free generated unique path names
2354 merge-recursive: Avoid working directory changes during recursive case
2355 merge-recursive: Fix recursive case with D/F conflict via add/add conflict
2356 merge-recursive: Fix sorting order and directory change assumptions
2357 merge-recursive: Fix code checking for D/F conflicts still being present
2358 merge-recursive: Save D/F conflict filenames instead of unlinking them
2359 merge-recursive: Split was_tracked() out of would_lose_untracked()
2360 merge-recursive: Allow make_room_for_path() to remove D/F entries
2361 merge-recursive: Split update_stages_and_entry; only update stages at end
2362 merge-recursive: Fix deletion of untracked file in rename/delete conflicts
2363 merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
2364 merge-recursive: Add comments about handling rename/add-source cases
2365 merge-recursive: Improve handling of rename target vs. directory addition
2366 merge-recursive: Consolidate process_entry() and process_df_entry()
2367 merge-recursive: Cleanup and consolidation of rename_conflict_info
2368 merge-recursive: Provide more info in conflict markers with file renames
2369 merge-recursive: When we detect we can skip an update, actually skip it
2370 merge-recursive: Fix modify/delete resolution in the recursive case
2371 merge-recursive: Introduce a merge_file convenience function
2372 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
2373 merge-recursive: Small cleanups for conflict_rename_rename_1to2
2374 merge-recursive: Defer rename/rename(2to1) handling until process_entry
2375 merge-recursive: Record more data needed for merging with dual renames
2376 merge-recursive: Create function for merging with branchname:file markers
2377 merge-recursive: Consider modifications in rename/rename(2to1) conflicts
2378 merge-recursive: Make modify/delete handling code reusable
2379 merge-recursive: Have conflict_rename_delete reuse modify/delete code
2380 merge-recursive: add handling for rename/rename/add-dest/add-dest
2381 merge-recursive: Fix working copy handling for rename/rename/add/add
2382 t6022: Add testcase for spurious "refusing to lose untracked" messages
2383 merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
2384 t6022: Additional tests checking for unnecessary updates of files
2385 merge-recursive: Avoid unnecessary file rewrites
2386 t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
2387 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
2388 merge-recursive: Don't re-sort a list whose order we depend upon
2391 git-svn: fix fetch with moved path when using rewriteRoot
2393 Fredrik Gustafsson (1):
2394 push: Don't push a repository with unpushed submodules
2396 Fredrik Kuivinen (6):
2397 Add obstack.[ch] from EGLIBC 2.10
2398 Add string search routines from GNU grep
2399 Adapt the kwset code to Git
2400 Use kwset in pickaxe
2402 obstack: Fix portability issues
2404 Giuseppe Bilotta (2):
2405 am: format is in $patch_format, not parse_patch
2406 am: fix stgit patch mangling
2409 t3030: fix accidental success in symlink rename
2410 t7006: modernize calls to unset
2411 test-lib: add helper functions for config
2412 t7006: use test_config helpers
2413 setup_pager: set GIT_PAGER_IN_USE
2414 diff: refactor COLOR_DIFF from a flag into an int
2415 git_config_colorbool: refactor stdout_is_tty handling
2416 color: delay auto-color decision until point of use
2417 config: refactor get_colorbool function
2418 diff: don't load color config in plumbing
2419 want_color: automatically fallback to color.ui
2420 support pager.* for external commands
2423 fetch: skip on-demand checking when no submodules are configured
2426 string-list: Add API to remove an item from an unsorted list
2427 t3005: do not assume a particular order of stdout and stderr of git-ls-files
2430 bisect: take advantage of gettextln, eval_gettextln.
2432 Jonathan Nieder (1):
2433 Documentation/remote-helpers: explain capabilities first
2435 Junio C Hamano (14):
2436 combine-diff: support format_callback
2437 read_gitfile_gently(): rename misnamed function to read_gitfile()
2438 clone: allow more than one --reference
2439 clone: clone from a repository with relative alternates
2440 Update draft release notes to 1.7.7
2441 Documentation: clarify "git clean -e <pattern>"
2442 Update draft release notes to 1.7.7
2443 Revert "Merge branch 'cb/maint-quiet-push' into maint"
2445 Update draft release notes to 1.7.7
2446 Minor update to how-to maintain git
2447 Prepare for 1.7.6.3 maintenance release
2452 Documentation/git-remote-helpers: explain how import works with multiple refs
2453 (short) documentation for the testgit remote helper
2455 Michael Haggerty (9):
2457 Document struct match_attr
2458 Increment num_attr in parse_attr_line(), not parse_attr()
2459 Change parse_attr() to take a pointer to struct attr_state
2460 Determine the start of the states outside of the pass loop
2461 Change while loop into for loop
2462 Unroll the loop over passes
2463 check-ref-format --print: Normalize refnames that start with slashes
2464 Forbid DEL characters in reference names
2466 Michael J Gruber (3):
2467 git-notes.txt: clarify -C vs. copy and -F
2468 log: Do not decorate replacements with --no-replace-objects
2469 RelNotes/1.7.7: minor fixes
2471 Michael Stapelberg (1):
2472 git-daemon.txt: specify --timeout in seconds
2475 branch -v: honor core.abbrev
2477 Nguyễn Thái Ngọc Duy (6):
2478 decoration: do not mis-decorate refs with same prefix
2479 Add for_each_commit_graft() to iterate all grafts
2480 Move write_shallow_commits to fetch-pack.c
2481 log: decorate grafted commits with "grafted"
2482 log: decorate "replaced" on to replaced commits
2483 clone: allow to clone from .git file
2486 git-p4: simple branch tests edits
2489 git-svn: New flag to emulate empty directories
2491 Sverre Rabbelier (1):
2492 SubmittingPathces: remove Cogito reference
2495 xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
2496 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
2499 Use memmove in ident_to_git
2500 t4014: check for empty files from git format-patch --stdout
2501 t4014: invoke format-patch with --stdout where intended
2502 t4014: "no-add-headers" is actually called "no-add-header"
2503 Document negated forms of format-patch --to --cc --add-headers
2504 strbuf_grow(): maintain nul-termination even for new buffer
2505 Documentation: clarify effects of -- <path> arguments
2506 t3903: fix misquoted rev-parse invocation
2509 git-p4: Allow setting rename/copy detection threshold
2510 git-p4: Add description of rename/copy detection options
2511 git-p4: Add test case for rename detection
2512 git-p4: Add test case for copy detection
2513 git-p4: Process detectCopiesHarder with --bool
2514 git-p4: Correct branch base depot path detection
2515 git-p4: Allow filtering Perforce branches by user
2516 git-p4: Allow branch definition with git config
2517 git-p4: Add simple test case for branch import
2520 Version v1.7.7-rc0; changes since v1.7.6.5:
2521 -------------------------------------------
2524 describe: Refresh the index when run with --dirty
2527 Add profile feedback build to git
2528 Add explanation of the profile feedback build to the README
2530 Clemens Buchacher (1):
2531 commit: allow partial commits with relative paths
2534 setup: Provide GIT_PREFIX to built-ins
2535 git: Remove handling for GIT_PREFIX
2536 git-mergetool--lib: Make vimdiff retain the current directory
2537 t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
2538 difftool--helper: Make style consistent with git
2539 mergetool--lib: Make style consistent with git
2540 mergetool--lib: Refactor tools into separate files
2541 mergetools/meld: Use '--output' when available
2544 am: ignore leading whitespace before patch
2547 stash: Add --include-untracked option to stash and remove all untracked files
2550 remote-helpers: export GIT_DIR variable to helpers
2551 parse-options: export opterr, optbug
2552 Reduce parse-options.o dependencies
2553 doc/fast-import: document feature import-marks-if-exists
2556 http: pass http.cookiefile using CURLOPT_COOKIEFILE
2559 verify_path: consider dos drive prefix
2560 connect: only log if all attempts failed (ipv4)
2562 Fredrik Gustafsson (2):
2563 git-sh-setup: add die_with_status
2564 submodule update: continue when a checkout fails
2566 Jakub Narebski (14):
2567 gitweb.js: No need for inProgress in blame_incremental.js
2568 gitweb.js: No need for loop in blame_incremental's handleResponse()
2569 gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
2570 gitweb: Check permissions first in git_search
2571 gitweb: Split body of git_search into subroutines
2572 gitweb: Clean up code in git_search_* subroutines
2573 gitweb: Make git_search_* subroutines render whole pages
2574 gitweb: Refactor git_header_html
2575 git-instaweb: Extract configuring web server into configure_httpd
2576 git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
2577 git-instaweb: Move all actions at the end of script
2578 git-instaweb: Check that correct config file exists for (re)start
2579 gitweb: Introduce common system-wide settings for convenience
2580 gitweb: Git config keys are case insensitive, make config search too
2583 t: add tests for cloning remotes with detached HEAD
2584 consider only branches in guess_remote_head
2585 make copy_ref globally available
2586 clone: always fetch remote HEAD
2587 limit "contains" traversals based on commit timestamp
2588 default core.clockskew variable to one day
2589 archive: reorder option parsing and config reading
2590 archive-tar: don't reload default config options
2591 archive: refactor list of archive formats
2592 archive: pass archiver struct to write_archive callback
2593 archive: move file extension format-guessing lower
2594 archive: refactor file extension format-guessing
2595 archive: implement configurable tar filters
2596 archive: provide builtin .tar.gz filter
2597 upload-archive: allow user to turn off filters
2598 parse-options: add OPT_STRING_LIST helper
2599 remote: use new OPT_STRING_LIST
2600 config: make git_config_parse_parameter a public function
2601 clone: accept config options on the command line
2602 git skew: a tool to find how big a clock skew exists in the history
2603 transport-helper: fix minor leak in push_refs_with_export
2604 t5800: factor out some ref tests
2605 t5800: document some non-functional parts of remote helpers
2606 git-remote-testgit: import non-HEAD refs
2607 transport-helper: don't feed bogus refs to export push
2608 git_remote_helpers: push all refs during a non-local export
2609 streaming: free git_istream upon closing
2610 docs: put listed example commands in backticks
2613 Documentation/submodule: add command references and update options
2616 sha1_file: use the correct type (ssize_t, not size_t) for read-style function
2619 sh-i18n--envsubst: do not crash when no arguments are given
2620 mingw.c: move definition of mingw_getenv down
2621 Windows: teach getenv to do a case-sensitive search
2622 rebase: do not print lots of usage hints after an obvious error message
2623 Make test number unique
2624 Skip archive --remote tests on Windows
2625 t3900: do not reference numbered arguments from the test script
2628 Add option hooks.diffopts to customize change summary in post-receive-email
2631 bisect: move argument parsing before state modification.
2632 bisect: use && to connect statements that are deferred with eval.
2633 bisect: add tests to document expected behaviour in presence of broken trees.
2634 bisect: introduce support for --no-checkout option.
2635 bisect: introduce --no-checkout support into porcelain.
2636 bisect: add tests for the --no-checkout option.
2637 bisect: add documentation for --no-checkout option.
2638 bisect: cleanup whitespace errors in git-bisect.sh.
2639 bisect: replace "; then" with "\n<tab>*then"
2640 misc-sh: fix up whitespace in some other .sh files.
2641 gettext: add gettextln, eval_gettextln to encode common idiom
2642 git-am: take advantage of gettextln and eval_gettextln.
2643 pull: take advantage of eval_gettextln
2644 stash: take advantage of eval_gettextln
2645 submodule: take advantage of gettextln and eval_gettextln.
2646 bisect: add support for bisecting bare repositories
2648 Jonathan Nieder (4):
2649 test: simplify return value of test_run_
2650 test: cope better with use of return for errors
2651 revert: plug memory leak in "cherry-pick root commit" codepath
2652 merge-recursive: take advantage of hardcoded empty tree
2655 Fix prefix handling in ref iteration functions
2656 ref namespaces: infrastructure
2657 ref namespaces: Support remote repositories via upload-pack and receive-pack
2658 ref namespaces: documentation
2659 ref namespaces: tests
2661 Junio C Hamano (52):
2662 index-pack: group the delta-base array entries also by type
2663 write_idx_file: introduce a struct to hold idx customization options
2664 index-pack: --verify
2665 write_idx_file: need_large_offset() helper function
2666 index-pack --verify: read anomalous offsets from v2 idx file
2667 packed_object_info_detail(): do not return a string
2668 sha1_object_info_extended(): expose a bit more info
2669 sha1_object_info_extended(): hint about objects in delta-base cache
2670 unpack_object_header(): make it public
2671 write_entry(): separate two helper functions out
2672 streaming: a new API to read from the object store
2673 streaming_write_entry(): use streaming API in write_entry()
2674 convert: CRLF_INPUT is a no-op in the output codepath
2675 streaming_write_entry(): support files with holes
2676 streaming: read non-delta incrementally from a pack
2677 sha1_file.c: expose helpers to read loose objects
2678 streaming: read loose objects incrementally
2679 checkout: make advice when reattaching the HEAD less loud
2680 merge: reword the final message
2681 convert.h: move declarations for conversion from cache.h
2682 Add streaming filter API
2683 stream filter: add "no more input" to the filters
2684 Add LF-to-CRLF streaming conversion
2685 streaming filter: ident filter
2686 streaming: filter cascading
2687 t0021: test application of both crlf and ident
2688 diff --stat-count: finishing touches
2689 index-pack: a miniscule refactor
2690 index-pack: start learning to emulate "verify-pack -v"
2691 index-pack: show histogram when emulating "verify-pack -v"
2692 verify-pack: use index-pack --verify
2693 verify_path(): simplify check at the directory boundary
2694 git-submodule.sh: clarify the "should we die now" logic
2695 Add option to disable NORETURN
2697 core: log offset pack data accesses happened
2698 pack-objects: optimize "recency order"
2699 diff-lib: simplify do_diff_cache()
2700 diff-lib: refactor run_diff_index() and do_diff_cache()
2701 Revert clock-skew based attempt to optimize tag --contains traversal
2702 Update draft release notes to 1.7.7
2703 Update draft release notes to 1.7.7
2704 bisect: further style nitpicks
2705 filter-branch.sh: de-dent usage string
2706 Update draft release notes to 1.7.7
2707 test: consolidate definition of $LF
2709 Update draft release notes to 1.7.7
2710 Update draft release notes to 1.7.7
2711 commit: reduce use of redundant global variables
2712 Update draft release notes to 1.7.7
2716 gitweb: allow space as delimiter in mime.types
2719 Update the Interix default build configuration.
2721 Michael Haggerty (29):
2722 doc: Add a link from gitattributes(5) to git-check-attr(1)
2723 doc: Correct git_attr() calls in example code
2724 Remove anachronism from comment
2725 Disallow the empty string as an attribute name
2726 git-check-attr: Add missing "&&"
2727 git-check-attr: Add tests of command-line parsing
2728 Provide access to the name attribute of git_attr
2729 git-check-attr: Use git_attr_name()
2730 Teach prepare_attr_stack() to figure out dirlen itself
2731 Extract a function collect_all_attrs()
2732 Remove redundant call to bootstrap_attr_stack()
2733 Remove redundant check
2734 Allow querying all attributes on a file
2735 git-check-attr: Extract a function output_attr()
2736 git-check-attr: Introduce a new variable
2737 git-check-attr: Extract a function error_with_usage()
2738 git-check-attr: Handle each error separately
2739 git-check-attr: Process command-line args more systematically
2740 git-check-attr: Error out if no pathnames are specified
2741 git-check-attr: Add an --all option to show all attributes
2742 git-check-attr: Drive two tests using the same raw data
2743 git-check-attr: Fix command-line handling to match docs
2744 Rename git_checkattr() to git_check_attr()
2745 git-check-attr: test that no output is written to stderr
2746 git-check-attr: Demonstrate problems with unnormalized paths
2747 git-check-attr: Demonstrate problems with relative paths
2748 git-check-attr: Normalize paths
2749 test-path-utils: Add subcommand "absolute_path"
2750 test-path-utils: Add subcommand "prefix_path"
2752 Michael J Gruber (3):
2753 diff.c: omit hidden entries from namelen calculation with --stat
2754 diff: introduce --stat-lines to limit the stat lines
2755 diff-options.txt: describe --stat-{width,name-width,count}
2758 git-p4: use test_when_finished in tests
2759 git-p4: add missing && in test
2760 git-p4: one test missing config git-p4.skipSubmitEditCheck
2761 git-p4: commit time should be most recent p4 change time
2763 Ramsay Allan Jones (3):
2764 help.c: Fix detection of custom merge strategy on cygwin
2765 t1301-*.sh: Fix the 'forced modes' test on cygwin
2766 config.c: Make git_config() work correctly when called recursively
2769 t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
2770 grep: fix coloring of hunk marks between files
2773 grep: add option to show whole function as context
2774 grep: long context options
2777 Tolerate zlib deflation with window size < 32Kb
2779 Sverre Rabbelier (14):
2780 t5800: use skip_all instead of prereq
2781 remote-curl: accept empty line as terminator
2782 git-remote-testgit: only push for non-local repositories
2783 git-remote-testgit: fix error handling
2784 fast-import: introduce 'done' command
2785 fast-export: support done feature
2786 transport-helper: factor out push_update_refs_status
2787 transport-helper: check status code of finish_command
2788 transport-helper: use the new done feature where possible
2789 transport-helper: update ref status after push with export
2790 transport-helper: change import semantics
2791 transport-helper: Use capname for refspec capability too
2792 transport-helper: implement marks location as capability
2793 transport-helper: die early on encountering deleted refs
2796 xdiff/xprepare: use memset()
2797 xdiff/xprepare: refactor abort cleanups
2798 xdiff/xpatience: factor out fall-back-diff function
2799 t4033-diff-patience: factor out tests
2800 teach --histogram to diff
2801 xdiff/xprepare: skip classification
2802 xdiff/xprepare: use a smaller sample size for histogram diff
2803 xdiff: do away with xdl_mmfile_next()
2804 http.c: fix an invalid free()
2805 Makefile: some changes for http-related flag documentation
2806 xdiff/xhistogram: rework handling of recursed results
2807 xdiff/xhistogram: rely on xdl_trim_ends()
2808 xdiff/xhistogram: drop need for additional variable
2811 A Windows path starting with a backslash is absolute
2812 real_path: do not assume '/' is the path seperator
2813 verify_dotfile(): do not assume '/' is the path seperator
2816 Makefile: add Minix configuration options.
2818 maximilian attems (2):
2819 am: pass exclude down to apply
2820 am: Document new --exclude=<path> option
2822 Ævar Arnfjörð Bjarmason (48):
2823 i18n: git-am add git-sh-i18n
2824 i18n: git-am one-line gettext $msg; echo
2825 i18n: git-am multi-line getttext $msg; echo
2826 i18n: git-am eval_gettext messages
2827 i18n: git-am gettext + gettext to stderr message
2828 i18n: git-am die messages
2829 i18n: git-am cannot_fallback messages
2830 i18n: git-am clean_abort messages
2831 i18n: git-am "Apply?" message
2832 i18n: git-am "Falling back" say message
2833 i18n: git-am core say messages
2834 i18n: git-am printf(1) message to eval_gettext
2835 i18n: git-pull add git-sh-i18n
2836 i18n: git-pull die messages
2837 i18n: git-pull eval_gettext + die message
2838 i18n: git-pull eval_gettext + warning message
2839 i18n: git-submodule add git-sh-i18n
2840 i18n: git-submodule echo + eval_gettext messages
2841 i18n: git-submodule say + eval_gettext messages
2842 i18n: git-submodule die + eval_gettext messages
2843 i18n: git-submodule $update_module say + die messages
2844 i18n: git-submodule "cached cannot be used" message
2845 i18n: git-submodule "Submodule change[...]" messages
2846 i18n: git-submodule $errmsg messages
2847 i18n: git-submodule "Entering [...]" message
2848 i18n: git-submodule "[...] path is ignored" message
2849 i18n: git-submodule "path not initialized" message
2850 i18n: git-submodule "blob" and "submodule" messages
2851 i18n: git-stash add git-sh-i18n
2852 i18n: git-stash echo + gettext message
2853 i18n: git-stash say + gettext messages
2854 i18n: git-stash die + gettext messages
2855 i18n: git-stash die + eval_gettext messages
2856 i18n: git-stash die + eval_gettext $* messages
2857 i18n: git-stash die + eval_gettext $1 messages
2858 i18n: git-stash "unknown option" message
2859 i18n: git-stash drop_stash say/die messages
2860 i18n: git-bisect add git-sh-i18n
2861 i18n: git-bisect gettext + echo message
2862 i18n: git-bisect echo + gettext messages
2863 i18n: git-bisect echo + eval_gettext message
2864 i18n: git-bisect die + gettext messages
2865 i18n: git-bisect die + eval_gettext messages
2866 i18n: git-bisect bisect_run + $@ messages
2867 i18n: git-bisect bisect_reset + $1 messages
2868 i18n: git-bisect bisect_replay + $1 messages
2869 i18n: git-bisect [Y/n] messages
2870 i18n: git-bisect bisect_next_check "You need to" message
2873 gitweb: pass string after encoding in utf-8 to syntax highlighter
2876 Version v1.7.6.5; changes since v1.7.6.4:
2877 -----------------------------------------
2880 date.c: Support iso8601 timezone formats
2883 stripspace: fix outdated comment
2884 fetch: create status table using strbuf
2885 blame: don't overflow time buffer
2888 make the sample pre-commit hook script reject names with newlines, too
2891 mergetool: Use args as pathspec to unmerged files
2894 mergetool: no longer need to save standard input
2895 name-rev --all: do not even attempt to describe non-commit object
2898 Marc-André Lureau (1):
2899 mailmap: xcalloc mailmap_info
2901 Martin von Zweigbergk (4):
2902 remote: write correct fetch spec when renaming remote 'remote'
2903 remote: "rename o foo" should not rename ref "origin/bar"
2904 remote rename: warn when refspec was not updated
2905 remote: only update remote-tracking branch if updating refspec
2907 Michael Haggerty (1):
2908 notes_merge_commit(): do not pass temporary buffer to other function
2910 Michael J Gruber (3):
2911 unpack-trees: print "Aborting" to stderr
2912 git-read-tree.txt: language and typography fixes
2913 git-read-tree.txt: correct sparse-checkout and skip-worktree description
2915 Nguyễn Thái Ngọc Duy (2):
2916 git-read-tree.txt: update sparse checkout examples
2917 Reindent closing bracket using tab instead of spaces
2920 gitweb: Fix links to lines in blobs when javascript-actions are enabled
2922 Ramsay Allan Jones (1):
2923 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
2926 Add MYMETA.yml to perl/.gitignore
2929 Documentation/git-update-index: refer to 'ls-files'
2932 Documentation: basic configuration of notes.rewriteRef
2935 Version v1.7.6.4; changes since v1.7.6.3:
2936 -----------------------------------------
2939 describe: Refresh the index when run with --dirty
2941 Clemens Buchacher (1):
2942 ls-files: fix pathspec display on error
2944 Giuseppe Bilotta (1):
2945 am: format is in $patch_format, not parse_patch
2948 git-mergetool: check return value from read
2951 t3005: do not assume a particular order of stdout and stderr of git-ls-files
2954 read_gitfile_gently(): rename misnamed function to read_gitfile()
2955 clone: allow more than one --reference
2956 clone: clone from a repository with relative alternates
2959 Michael Haggerty (2):
2960 check-ref-format --print: Normalize refnames that start with slashes
2961 Forbid DEL characters in reference names
2963 Michael J Gruber (1):
2964 branch.c: use the parsed branch name
2966 Nguyễn Thái Ngọc Duy (1):
2967 clone: allow to clone from .git file
2970 Version v1.7.6.3; changes since v1.7.6.2:
2971 -----------------------------------------
2974 Do not log unless all connect() attempts fail
2977 status: fix bug with missing --ignore files
2978 tag: speed up --contains calculation
2979 strbuf_split: add a max parameter
2980 fix "git -c" parsing of values with equals signs
2981 config: die on error in command-line config
2982 config: avoid segfault when parsing command-line config
2983 strbuf: allow strbuf_split to work on non-strbufs
2984 config: use strbuf_split_str instead of a temporary strbuf
2985 reset: give better reflog messages
2988 fetch: skip on-demand checking when no submodules are configured
2990 Jonathan Nieder (2):
2991 Documentation: quote double-dash for AsciiDoc
2992 Documentation/i18n: quote double-dash for AsciiDoc
2995 git status --ignored: tests and docs
2996 mergetool: check return value from read
2997 Prepare for 1.7.6.3 maintenance release
3000 Michael Schubert (1):
3001 reflog: actually default to subcommand 'show'
3003 Sverre Rabbelier (1):
3004 SubmittingPathces: remove Cogito reference
3007 tests: cleanup binary test vector files
3010 Version v1.7.6.2; changes since v1.7.6.1:
3011 -----------------------------------------
3014 whitespace: have SP on both sides of an assignment "="
3015 Revert "Merge branch 'cb/maint-quiet-push' into maint"
3019 update-ref: whitespace fix
3022 Documentation: clarify effects of -- <path> arguments
3025 Version v1.7.6.1; changes since v1.7.6:
3026 ---------------------------------------
3029 Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
3030 Document the underlying protocol used by shallow repositories and --depth commands.
3033 rebase -i -p: include non-first-parent commits in todo list
3036 Documentation: clearly specify what refs are honored by core.logAllRefUpdates
3039 t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
3040 git-submodule.sh: preserve stdin for the command spawned by foreach
3043 get_indexed_object can return NULL if nothing is in that slot; check for it
3045 Carlos Martín Nieto (1):
3046 Documentation: clarify the invalidated tree entry format
3048 Clemens Buchacher (3):
3049 error_routine: use parent's stderr if exec fails
3050 propagate --quiet to send-pack/receive-pack
3051 notice error exit from pager
3054 doc/fast-import: clarify notemodify command
3057 Documentation: ignore *.pdf files
3058 Documentation/Makefile: add *.pdf to `clean' target
3061 connect: correctly number ipv6 network adapter
3063 Fredrik Kuivinen (1):
3064 Makefile: Track changes to LDFLAGS and relink when necessary
3067 add gitignore entry to description about how to write a builtin
3068 add technical documentation about ref iteration
3071 Documentation: minor grammatical fix in rev-list-options.txt
3074 gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
3075 gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
3078 combine-diff: split header printing into its own function
3079 combine-diff: calculate mode_differs earlier
3080 combine-diff: handle binary files as binary
3081 refactor get_textconv to not require diff_filespec
3082 combine-diff: respect textconv attributes
3083 tag: accept multiple patterns for --list
3084 docs: document --textconv diff option
3085 t7400: fix bogus test failure with symlinked trash
3086 fast-export: quote paths in output
3087 am: refresh the index at start and --resolved
3090 submodule add: test failure when url is not configured in superproject
3091 submodule add: allow relative repository path even when no url is set
3092 submodule add: clean up duplicated code
3093 fetch: Also fetch submodules in subdirectories in on-demand mode
3094 submodule add: always initialize .git/config entry
3095 tests: print failed test numbers at the end of the test run
3096 submodule: update and add must honor --quiet flag
3098 Johannes Schindelin (1):
3099 get_pwd_cwd(): Do not trust st_dev/st_ino blindly
3102 Add a test to check that git ls-tree sets non-zero exit code on error.
3103 Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
3105 Julian Phillips (1):
3106 remote-curl: Add a format check to parsing of info/refs
3108 Junio C Hamano (29):
3109 diff-index --quiet: learn the "stop feeding the backend early" logic
3110 checkout -b <name>: correctly detect existing branch
3111 sha1_file.c: "legacy" is really the current format
3112 zlib wrapper: refactor error message formatter
3113 zlib: wrap remaining calls to direct inflate/inflateEnd
3114 zlib: wrap inflateInit2 used to accept only for gzip format
3115 zlib: wrap deflate side of the API
3116 zlib: wrap deflateBound() too
3117 zlib: zlib can only process 4GB at a time
3118 zlib: allow feeding more than 4GB in one go
3119 t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
3120 cygwin: trust executable bit by default
3121 git-remote.txt: avoid sounding as if loose refs are the only ones in the world
3122 check-ref-format doc: de-emphasize the implementation detail of a ref
3123 git.txt: de-emphasize the implementation detail of a ref
3124 glossary: update description of "tag"
3125 glossary: update description of head and ref
3126 glossary: clarify description of HEAD
3127 submodule sync: do not auto-vivify uninteresting submodule
3128 "branch -d" can remove more than one branches
3129 test: skip clean-up when running under --immediate mode
3130 checkout: do not write bogus reflog entry out
3131 reset [<commit>] paths...: do not mishandle unmerged paths
3132 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
3133 receive-pack: do not overstep command line argument array
3134 helping smart-http/stateless-rpc fetch race
3136 Update draft release notes for 1.7.6.1
3139 Martin von Zweigbergk (2):
3140 Documentation: use [verse] for SYNOPSIS sections
3141 rebase: clarify "restore the original branch"
3143 Michael Haggerty (6):
3144 git-svn: Demonstrate a bug with root commits in mergeinfo ranges
3145 git-svn: Disambiguate rev-list arguments to improve error message
3146 git-svn: Correctly handle root commits in mergeinfo ranges
3147 gitattributes: Clarify discussion of attribute macros
3148 gitattributes: Reword "attribute macro" to "macro attribute"
3149 Do not use C++-style comments
3151 Michael Schubert (1):
3152 help_unknown_cmd: do not propose an "unknown" cmd
3155 filter-branch: Export variable `workdir' for --commit-filter
3158 git-remote.txt: fix wrong remote refspec
3160 Nguyễn Thái Ngọc Duy (3):
3161 Break down no-lstat() condition checks in verify_uptodate()
3162 checkout-index: remove obsolete comment
3163 fetch-pack: check for valid commit from server
3166 pull: remove extra space from reflog message
3168 Pavan Kumar Sunkara (1):
3169 git-config: Remove extra whitespaces
3171 Peter Collingbourne (1):
3172 Documentation: git-filter-branch honors replacement refs
3175 Version v1.7.6; changes since v1.7.6-rc3:
3176 -----------------------------------------
3182 completion: replace core.abbrevguard to core.abbrev
3185 Version v1.7.6-rc3; changes since v1.7.6-rc2:
3186 ---------------------------------------------
3189 builtin/gc.c: add missing newline in message
3192 sh-i18n--envsubst.c: do not #include getopt.h
3194 Christof Krüger (1):
3195 Documentation: git diff --check respects core.whitespace
3198 Fix typo: existant->existent
3201 gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
3204 t/Makefile: pass test opts to valgrind target properly
3205 tests: link shell libraries into valgrind directory
3208 plug a few coverity-spotted leaks
3211 t7810: avoid unportable use of "echo"
3215 Version v1.7.6-rc2; changes since v1.7.6-rc1:
3216 ---------------------------------------------
3218 Jonathan Nieder (1):
3219 gitweb: do not misparse nonnumeric content tag files that contain a digit
3225 Version v1.7.6-rc1; changes since v1.7.6-rc0:
3226 ---------------------------------------------
3229 t3703: skip more tests using colons in file names on Windows
3232 t7508: demonstrate status's failure to use --porcelain format with -z
3233 builtin/commit.c: set status_format _after_ option parsing
3236 gitweb: Move information about installation from README to INSTALL
3237 gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
3238 gitweb: Move "Requirements" up in gitweb/INSTALL
3239 gitweb: Fix usability of $prevent_xss
3242 diff_tree: disable QUICK optimization with diff filter
3245 fetch: do not leak a refspec
3248 diff: futureproof "stop feeding the backend early" logic
3252 Version v1.7.6-rc0; changes since v1.7.5.4:
3253 -------------------------------------------
3256 Do not strip empty lines / trailing spaces from a commit message template
3258 Carlos Martín Nieto (1):
3259 log: convert to parse-options
3262 Use a temporary index for git commit --interactive
3263 Allow git commit --interactive with paths
3264 Add support for -p/--patch to git-commit
3265 Add commit to list of config.singlekey commands
3266 Test atomic git-commit --interactive
3269 rebase: create HEAD reflog entry when aborting
3272 Share color list between graph and show-branch
3273 http: make curl callbacks match contracts from curl header
3274 http-push: use const for strings in signatures
3275 http-push: refactor curl_easy_setup madness
3278 t6022: New test checking for unnecessary updates of renamed+modified files
3279 t6022: New test checking for unnecessary updates of files in D/F conflicts
3280 merge-recursive: When we detect we can skip an update, actually skip it
3283 strbuf: make sure buffer is zero-terminated
3284 config: support values longer than 1023 bytes
3287 test that git status works with merge conflict in, .gitmodules
3290 hashcmp(): inline memcmp() by hand to optimize
3292 Jakub Narebski (13):
3293 gitweb: Restructure projects list generation
3294 gitweb: Change the way "content tags" ('ctags') are handled
3295 gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
3296 gitweb: Split JavaScript for maintability, combining on build
3297 gitweb.js: Update and improve comments in JavaScript files
3298 gitweb.js: Provide default values for padding in padLeftStr and padLeft
3299 gitweb.js: Extract and improve datetime handling
3300 gitweb.js: Introduce code to handle cookies from JavaScript
3301 gitweb.js: Provide getElementsByClassName method (if it not exists)
3302 gitweb: Refactor generating of long dates into format_timestamp_html
3303 gitweb: Unify the way long timestamp is displayed
3304 gitweb: Make JavaScript ability to adjust timezones configurable
3305 gitweb: Refactor reading and parsing config file into read_config_file
3308 "git log -h": typofix misspelled 'suppress'
3309 Add log.abbrevCommit config variable
3312 notes: make expand_notes_ref globally accessible
3313 revision.c: refactor notes ref expansion
3314 notes: refactor display notes extra refs field
3315 notes: refactor display notes default handling
3316 revision.c: support --notes command-line option
3317 revision.c: make --no-notes reset --notes list
3318 format-patch: wrap email addresses after long names
3319 add tests for various blame formats
3320 blame: refactor porcelain output
3321 blame: add --line-porcelain output format
3322 t7501.8: feed a meaningful command
3323 fetch: avoid repeated commits in mark_complete
3324 Makefile: sort TEST_PROGRAMS list
3325 refactor refs_from_alternate_cb to allow passing extra data
3326 bisect: refactor sha1_array into a generic sha1 list
3327 receive-pack: eliminate duplicate .have refs
3328 doc: discuss textconv versus external diff drivers
3329 remote: allow "-t" with fetch mirrors
3330 read_in_full: always report errors
3331 t: test subject handling in format-patch / am pipeline
3332 mailinfo: always clean up rfc822 header folding
3333 pretty: add pp_commit_easy function for simple callers
3334 clean up calling conventions for pretty.c functions
3335 format-patch: preserve subject newlines with -k
3336 rebase: write a reflog entry when finishing
3337 format-patch: make zero-length subject prefixes prettier
3340 Submodules: Don't parse .gitmodules when it contains, merge conflicts
3341 unpack-trees: add the dry_run flag to unpack_trees_options
3342 Teach read-tree the -n|--dry-run option
3345 diffcore-rename.c: avoid set-but-not-used warning
3346 plug a DIR buffer leak in rerere.c
3349 log/pretty-options: Document --[no-]notes and deprecate old notes options
3350 Make "git notes add" more user-friendly when there are existing notes
3351 Add several testcases for --dirstat and friends
3352 Make --dirstat=0 output directories that contribute < 0.1% of changes
3353 Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
3354 Add config variable for specifying default --dirstat behavior
3355 Allow specifying --dirstat cut-off percentage as a floating point number
3356 New --dirstat=lines mode, doing dirstat analysis based on diffstat
3357 Improve error handling when parsing dirstat parameters
3358 Mark dirstat error messages for translation
3361 t3703: Skip tests using directory name ":" on Windows
3362 Tweak t3102-ls-tree-wildcards to run on Windows
3363 Windows: add a wrapper for the shutdown() system call
3365 John 'Warthog9' Hawley (2):
3366 gitweb: JavaScript ability to adjust time based on timezone
3367 gitweb.js: Add UI for selecting common timezone to display dates
3370 git: add --info-path and --man-path options
3372 Jonathan Nieder (15):
3373 revisions: split out handle_revision_pseudo_opt function
3374 revisions: allow --glob and friends in parse_options-enabled commands
3375 Documentation: clarify meaning of --html-path, --man-path, and --info-path
3376 tests: eliminate unnecessary setup test assertions
3377 tests: teach verify_parents to check for extra parents
3378 tests: check git does not barf on merge.ff values for future versions of git
3379 completion: move private shopt shim for zsh to __git_ namespace
3380 t4018 (funcname patterns): make .gitattributes state easier to track
3381 t4018 (funcname patterns): make configuration easier to track
3382 t4018 (funcname patterns): minor cleanups
3383 userdiff/perl: anchor "sub" and "package" patterns on the left
3384 userdiff/perl: match full line of POD headers
3385 userdiff/perl: catch sub with brace on second line
3386 tests: make test_expect_code quieter on success
3387 userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
3389 Junio C Hamano (53):
3390 merge-recursive: tweak magic band-aid
3391 git diff -D: omit the preimage of deletes
3392 pathspec: rename per-item field has_wildcard to use_wildcard
3393 magic pathspec: add tentative ":/path/from/top/level" pathspec support
3394 merge: allow "-" as a short-hand for "previous branch"
3395 magic pathspec: futureproof shorthand form
3396 magic pathspec: add ":(icase)path" to match case insensitively
3398 Update draft release notes to 1.7.6
3399 Update draft release notes to 1.7.6
3400 Update draft release notes to 1.7.6
3401 Update draft release notes to 1.7.6
3402 merge: introduce merge.ff configuration variable
3403 rerere: libify rerere_clear() and rerere_gc()
3404 index_fd(): turn write_object and format_check arguments into one flag
3405 index_fd(): split into two helper functions
3406 convert: rename the "eol" global variable to "core_eol"
3407 convert: give saner names to crlf/eol variables, types and functions
3408 convert: make it safer to add conversion attributes
3409 convert: make it harder to screw up adding a conversion attribute
3410 git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
3411 Revert "magic pathspec: add ":(icase)path" to match case insensitively"
3412 pathspec: drop "lone : means no pathspec" from get_pathspec()
3413 grep: use get_pathspec() correctly
3414 fix overstrict :<path> diagnosis
3415 fix overslow :/no-such-string-ever-existed diagnostics
3416 rev/path disambiguation: further restrict "misspelled index entry" diag
3417 Revert "completion: don't declare 'local words' to make zsh happy"
3418 Update draft release notes to 1.7.6
3419 revision.c: leave a note for "a lone :" enhancement
3420 Update draft release notes to 1.7.6
3421 Bigfile: teach "git add" to send a large file straight to a pack
3422 Declare lookup_replace_object() in cache.h, not in commit.h
3423 t6050: make sure we test not just commit replacement
3424 read_sha1_file(): get rid of read_sha1_file_repl() madness
3425 inline lookup_replace_object() calls
3426 read_sha1_file(): allow selective bypassing of replacement mechanism
3427 Sync release notes for 1.7.6 to exclude what are in maintenance track
3428 git-grep: update tests now regexp type is "last one wins"
3429 Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
3430 Update release notes to 1.7.6
3431 notes remove: allow removing more than one
3432 notes remove: --ignore-missing
3433 notes remove: --stdin reads from the standard input
3434 show: --ignore-missing
3435 Revert "Merge branch 'en/merge-recursive'"
3436 Update draft release notes to 1.7.6
3437 Update 1.7.6 draft release notes
3438 require-work-tree wants more than what its name says
3439 compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
3440 Update 1.7.6 draft release notes
3441 log: --quiet should serve as synonym to -s
3442 Update draft release notes to 1.7.6
3445 git-p4: add option to preserve user names
3446 git-p4: small improvements to user-preservation
3447 git-p4: warn if git authorship won't be retained
3449 Marius Storm-Olsen (1):
3450 Automatically autoload bashcompinit for ZSH, when needed
3452 Martin von Zweigbergk (34):
3453 rebase: clearer names for directory variables
3454 rebase: refactor reading of state
3455 rebase: read state outside loop
3456 rebase: remove unused rebase state 'prev_head'
3457 rebase: improve detection of rebase in progress
3458 rebase: act on command line outside parsing loop
3459 rebase: stricter check of standalone sub command
3460 rebase: align variable names
3461 rebase: align variable content
3462 rebase: factor out command line option processing
3463 rebase -i: remove now unnecessary directory checks
3464 rebase: reorder validation steps
3465 rebase: factor out reference parsing
3466 rebase: factor out clean work tree check
3467 rebase: factor out call to pre-rebase hook
3468 rebase -i: support --stat
3469 rebase: remove $branch as synonym for $orig_head
3470 rebase: extract merge code to new source file
3471 rebase: extract am code to new source file
3472 rebase: show consistent conflict resolution hint
3473 rebase -i: align variable names
3474 rebase: make -v a tiny bit more verbose
3475 rebase: factor out sub command handling
3476 rebase: extract code for writing basic state
3477 rebase: remember verbose option
3478 rebase: remember strategy and strategy options
3479 rebase -m: remember allow_rerere_autoupdate option
3480 rebase -m: don't print exit code 2 when merge fails
3481 git-rebase--am: remove unnecessary --3way option
3482 rebase -i: don't read unused variable preserve_merges
3483 rebase -i: remove unnecessary state rebase-root
3484 rebase: use @{upstream} if no upstream specified
3485 Makefile: do not install sourced rebase scripts
3486 rebase: define options in OPTIONS_SPEC
3488 Mathias Lafeldt (1):
3489 t/test-lib.sh: minor readability improvements
3491 Michael Haggerty (1):
3492 git-svn: add an option to skip the creation of empty directories
3494 Michael J Gruber (7):
3495 contrib/completion: --notes, --no-notes
3496 rev-list --count: separate count for --cherry-mark
3497 t1020: test !alias in subdirectory
3498 handle_alias: provide GIT_PREFIX to !alias
3499 config: define and document exit codes
3500 config: Give error message when not changing a multivar
3501 sh-18n: quell "unused variable" warning
3503 Michael Schubert (2):
3504 tag: disallow '-' as tag name
3505 ls-remote: the --exit-code option reports "no matching refs"
3507 Michał Kiedrowicz (11):
3508 Documentation: Add --line-number to git-grep synopsis
3509 contrib/completion: --line-number to git grep
3510 grep: Put calls to fixmatch() and regmatch() into patmatch()
3511 grep: Fix a typo in a comment
3512 grep: Extract compile_regexp_failed() from compile_regexp()
3513 git-grep: Learn PCRE
3514 configure: Check for libpcre
3515 grep: Add basic tests
3516 git-grep: Bail out when -P is used with -F or -E
3517 git-grep: Update tests (mainly for -P)
3518 git-grep: Fix problems with recently added tests
3521 blame: add --abbrev command line option and make it honor core.abbrev
3523 Nguyễn Thái Ngọc Duy (8):
3524 Reimplement read_tree_recursive() using tree_entry_interesting()
3525 Convert read_tree{,_recursive} to support struct pathspec
3526 Improve tree_entry_interesting() handling code
3527 setup: return correct prefix if worktree is '/'
3528 Kill off get_relative_cwd()
3529 t1011: fix sparse-checkout initialization and add new file
3530 sparse checkout: do not eagerly decide the fate for whole directory
3531 t3703, t4208: add test cases for magic pathspec
3533 Nicolas Morey-Chaisemartin (1):
3534 submodule: Add --force option for git submodule update
3536 Rafael Gieschke (1):
3537 ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
3539 Ramsay Allan Jones (9):
3540 Makefile: Use cgcc rather than sparse in the check target
3541 sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
3542 sparse: Fix some "Using plain integer as NULL pointer" warnings
3543 sparse: Fix an "symbol 'format_subject' not declared" warning
3544 sparse: Fix an "symbol 'merge_file' not decared" warning
3545 sparse: Fix errors due to missing target-specific variables
3546 sparse: Fix some "symbol not declared" warnings
3547 setup.c: Fix some "symbol not declared" sparse warnings
3548 config.c: Remove unused git_config_global() function
3551 strbuf: clarify assertion in strbuf_setlen()
3554 completion: don't modify the $cur variable in completion functions
3555 completion: remove unnecessary _get_comp_words_by_ref() invocations
3556 completion: don't declare 'local words' to make zsh happy
3558 Sebastien Cevey (3):
3559 gitweb: Split git_project_list_body in two functions
3560 gitweb: Modularized git_get_project_description to be more generic
3561 gitweb: Optional grouping of projects by category
3564 t5541-http-push: add test for chunked
3566 Ævar Arnfjörð Bjarmason (5):
3567 git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
3568 git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
3569 git-sh-i18n.sh: add GIT_GETTEXT_POISON support
3570 Makefile: add xgettext target for *.sh files
3571 git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
3574 Version v1.7.5.4; changes since v1.7.5.3:
3575 -----------------------------------------
3578 Documentation/technical/api-diff.txt: correct name of diff_unmerge()
3579 git-submodule.sh: separate parens by a space to avoid confusing some shells
3582 config: make environment parsing routines static
3583 git_config: don't peek at global config_parameters
3584 config: always parse GIT_CONFIG_PARAMETERS during git_config
3585 read_gitfile_gently: use ssize_t to hold read result
3586 docs: minor grammar fixes to git-status
3587 docs: update status --porcelain format
3588 docs: make sure literal "->" isn't converted to arrow
3589 docs: fix some antique example output
3592 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
3593 remove tests of always-false condition
3594 diffcore-rename.c: avoid set-but-not-used warning
3596 Jonathan Nieder (3):
3597 tests: check error message from run_command
3598 run-command: handle short writes and EINTR in die_child
3599 Documentation: do not misinterpret refspecs as bold text
3601 Junio C Hamano (26):
3602 builtin/diff.c: remove duplicated call to diff_result_code()
3603 diffcore-rename: refactor "too many candidates" logic
3604 diffcore-rename: record filepair for rename src
3605 diffcore-rename: fall back to -C when -C -C busts the rename limit
3606 i18n: do not overuse C_LOCALE_OUTPUT
3607 i18n: .git file is not a human readable message (t5601)
3608 i18n: use test_i18ncmp in t1200 and t2200
3609 i18n: do not overuse C_LOCALE_OUTPUT (grep)
3610 i18n: use test_i18ngrep in lib-httpd and t2019
3611 i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
3612 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
3613 i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
3614 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
3615 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
3616 i18n: use test_i18ngrep in t7201
3617 i18n: use test_i18ncmp in t7500
3618 i18n: use test_i18ngrep in t7501
3619 i18n: use test_i18ngrep and test_i18ncmp in t7502
3620 i18n: use test_i18ngrep in t7506
3621 i18n: use test_i18n{grep,cmp} in t7508
3622 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
3623 handle_options(): do not miscount how many arguments were used
3624 userformat_find_requirements(): find requirement for the correct format
3625 config.mak.in: allow "configure --sysconfdir=/else/where"
3626 Start 1.7.5.4 draft release notes
3629 Mathias Lafeldt (1):
3630 t/README: unify documentation of test function args
3632 Ramkumar Ramachandra (4):
3633 Documentation: Add filter.<driver>.* to config
3634 Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
3635 Documentation: Add diff.<driver>.* to config
3636 Documentation: Allow custom diff tools to be specified in 'diff.tool'
3639 add -i: ignore terminal escape sequences
3641 Valentin Haenel (5):
3642 config.txt: 'interactive.singlekey; is used by...
3643 git-add.txt: document 'interactive.singlekey'
3644 git-stash.txt: better docs for '--patch'
3645 git-checkout.txt: better docs for '--patch'
3646 git-reset.txt: better docs for '--patch'
3648 Ævar Arnfjörð Bjarmason (7):
3649 i18n: mark merge "Could not read from" message for translation
3650 i18n: mark merge "upstream" messages for translation
3651 i18n: mark merge CHERRY_PICK_HEAD messages for translation
3652 i18n: mark clone nonexistent repository message for translation
3653 i18n: mark checkout --detach messages for translation
3654 i18n: mark checkout plural warning for translation
3655 i18n: mark init-db messages for translation
3658 Version v1.7.5.3; changes since v1.7.5.2:
3659 -----------------------------------------
3661 Felipe Contreras (1):
3662 git-completion: fix regression in zsh support
3664 Fraser Tweedale (1):
3665 gitweb: supply '-n' to gzip for identical output
3668 send-pack: unbreak push over stateless rpc
3669 cherry-pick: handle root commits with external strategies
3670 revert: allow reverting a root commit
3671 t3503: test cherry picking and reverting root commits
3672 connect: treat generic proxy processes like ssh processes
3673 connect: let callers know if connection is a socket
3674 send-pack: avoid deadlock on git:// push with failed pack-objects
3675 test core.gitproxy configuration
3678 do not read beyond end of malloc'd buffer
3681 Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
3682 send-pack: avoid deadlock when pack-object dies early
3683 Honor $(prefix) set in config.mak* when defining ETC_GIT*
3685 Jonathan Nieder (5):
3686 Revert "t0081 (line-buffer): add buffering tests"
3687 Documentation: explain how to check for patch corruption
3688 Documentation: hints for sending patches inline with Thunderbird
3689 Documentation: publicize KMail hints for sending patches inline
3690 Documentation: publicize hints for sending patches with GMail
3693 Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
3694 setup_revisions(): take pathspec from command line and --stdin correctly
3695 sideband_demux(): fix decl-after-stmt
3699 Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
3701 Michael J Gruber (2):
3702 config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
3703 git-svn: Fix git svn log --show-commit
3705 Nguyễn Thái Ngọc Duy (1):
3706 init/clone: remove short option -L and document --separate-git-dir
3708 Rafael Gieschke (1):
3709 copy_gecos: fix not adding nlen to len when processing "&"
3711 Stefan Sperling (1):
3712 remove noise and inaccuracies from git-svn docs
3715 Version v1.7.5.2; changes since v1.7.5.1:
3716 -----------------------------------------
3719 git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
3721 Brian Gernhardt (1):
3722 t/annotate-tests: Use echo & cat instead of sed
3724 Carlos Martín Nieto (2):
3725 format-patch: don't pass on the --quiet flag
3726 format-patch: document --quiet option
3729 Pass empty file to p4merge where no base is suitable.
3732 shell: add missing initialization of argv0_path
3735 Look for password in both CVS and CVSNT password files.
3738 git-instaweb: Simplify build dependency on gitweb
3739 Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
3742 pretty: quote rfc822 specials in email addresses
3743 add tests for merge-index / merge-one-file
3744 merge-one-file: fix broken merges with alternate work trees
3747 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
3750 t5400: Fix a couple of typos
3752 Jonathan Nieder (4):
3753 Restructure documentation for git-merge-base.
3754 Documentation: describe the format of messages with inline patches
3755 add, merge, diff: do not use strcasecmp to compare config variable names
3756 provide a copy of the LGPLv2.1
3759 mergetool: Teach about submodules
3762 blame: tolerate bogus e-mail addresses a bit better
3765 Remove duplicated "is a"
3767 Junio C Hamano (19):
3768 test: use $_z40 from test-lib
3769 diff.c: return filepair from diff_unmerge()
3770 diff: remove often unused parameters from diff_unmerge()
3771 diff-files: show unmerged entries correctly
3772 Fix "add -u" that sometimes fails to resolve unmerged paths
3773 add -p: 'q' should really quit
3774 t3701: Editing a split hunk in an "add -p" session
3775 add--interactive.perl: factor out repeated --recount option
3776 "add -p": work-around an old laziness that does not coalesce hunks
3777 t3701: fix here document
3778 merge: make branch.<name>.mergeoptions correctly override merge.<option>
3779 t3701: add-p-fix makes the last test to pass
3780 t1507: avoid "${parameter<op>'word'}" inside double-quotes
3783 git_open_noatime(): drop unused parameter
3784 Update draft release notes to 1.7.5.2
3785 Update draft release notes to 1.7.5.2
3788 Martin von Zweigbergk (1):
3789 diffcore-rename: don't consider unmerged path as source
3791 Michael J Gruber (1):
3792 git-fast-import.txt: --relative-marks takes no parameter
3794 Sebastian Schuberth (1):
3795 doc: Clarify that "cherry-pick -x" does not use "git notes"
3797 Sverre Rabbelier (1):
3798 fast-import: fix option parser for no-arg options
3800 Valentin Haenel (3):
3801 git-svn.txt: fix usage of --add-author-from
3802 git-svn.txt: move option descriptions
3803 git-svn.txt: small typeface improvements
3805 Vincent van Ravesteijn (1):
3806 Documentation: update to git-merge-base --octopus
3809 Version v1.7.5.1; changes since v1.7.5:
3810 ---------------------------------------
3813 clean: unreadable directory may still be rmdir-able if it is empty
3816 stash: add two more tests for --no-keep-index
3817 stash: ensure --no-keep-index and --patch can be used in any order
3820 stash: fix accidental apply of non-existent stashes
3821 stash: drop dirty worktree check on apply
3822 upload-pack: start pack-objects before async rev-list
3825 --dirstat: Describe non-obvious differences relative to --stat or regular diff
3826 --dirstat-by-file: Make it faster and more correct
3827 Teach --dirstat not to completely ignore rearranged lines within a file
3828 --dirstat: In case of renames, use target filename instead of source filename
3831 stash: fix false positive in the invalid ref test.
3834 Teach core.bigfilethreashold to pack-objects
3835 http: clear POSTFIELDS when initializing a slot
3836 Start 1.7.5.1 maintenance track
3839 Michael J Gruber (6):
3840 builtin/log.c: separate default and setup of cmd_log_init()
3841 t/t1411: test reflog with formats
3842 reflog: fix overriding of command line options
3843 t1506: factor out test for "Did you mean..."
3844 sha1_name: Suggest commit:./file for path in subdir
3845 date: avoid "X years, 12 months" in relative dates
3848 git-send-email: fix missing space in error message
3850 Valentin Haenel (1):
3851 git-add.txt: document 'add.ignoreErrors'
3854 Version v1.7.5; changes since v1.7.5-rc3:
3855 -----------------------------------------
3861 Version v1.7.5-rc3; changes since v1.7.5-rc2:
3862 ---------------------------------------------
3865 Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
3869 Michael J Gruber (3):
3870 git.txt: fix list continuation
3871 t3306,t5304: avoid clock skew issues
3872 git-svn.txt: Document --mergeinfo
3875 archive: document limitation of tar.umask config setting
3878 Version v1.7.5-rc2; changes since v1.7.5-rc1:
3879 ---------------------------------------------
3881 Alejandro R. Sedeño (1):
3882 git-svn: Add a svn-remote.<name>.pushurl config key
3885 gitk: Take only numeric version components when computing $git_version
3886 gitk: Update cherry-pick error message parsing
3889 git-p4: replace each tab with 8 spaces for consistency
3892 git-svn: Cache results of running the executable "git config"
3895 remove doubled words, e.g., s/to to/to/, and fix related typos
3898 t0001: guard a new test with SYMLINKS prerequisite
3899 t2021: mark a test as fixed
3905 gitk: Quote tag names in event bindings to avoid problems with % chars
3908 gitk: Allow user to control how much of the SHA1 ID gets auto-selected
3910 Ramkumar Ramachandra (1):
3911 revert: Hide '-r' option in default usage
3913 Ramsay Allan Jones (1):
3914 i18n: avoid parenthesized string as array initializer
3917 gitk: spelling fixes in Russian translation
3919 Ævar Arnfjörð Bjarmason (1):
3920 Makefile: extract Q_() source strings as ngettext()
3923 Version v1.7.5-rc1; changes since v1.7.5-rc0:
3924 ---------------------------------------------
3927 Remove old binaries from .gitignore
3928 Fix two unused variable warnings in gcc 4.6
3931 gitweb: Fix parsing of negative fractional timezones in JavaScript
3934 merge: match the help text with the documentation
3937 merge: merge unborn index before setting ref
3938 pull: do not clobber untracked files on initial pull
3939 remote: disallow some nonsensical option combinations
3940 remote: separate the concept of push and fetch mirrors
3941 remote: deprecate --mirror
3942 docs: fix filter-branch subdir example for exotic repo names
3943 pull: do not clobber untracked files on initial pull
3946 fetch/pull: recurse into submodules when necessary
3947 fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
3948 config: teach the fetch.recurseSubmodules option the 'on-demand' value
3949 Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
3950 fetch/pull: Don't recurse into a submodule when commits are already present
3951 submodule update: Don't fetch when the submodule commit is already present
3952 fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
3955 grep: allow -E and -n to be turned on by default via configuration
3957 Jonathan Nieder (1):
3958 compat: add missing #include <sys/resource.h>
3961 merge: merge with the default upstream branch without argument
3962 "log --cherry-pick" documentation regression fix
3963 Doc: mention --delta-base-offset is the default for Porcelain commands
3965 Update release notes
3966 Start preparing for 1.7.4.4
3970 Lawrence Mitchell (1):
3971 git.el: Don't use font-lock-compile-keywords
3973 Michael J Gruber (3):
3974 revisions.txt: consistent use of quotes
3975 revisions.txt: structure with a labelled list
3976 revisions.txt: language improvements
3978 Nguyễn Thái Ngọc Duy (2):
3979 git-init.txt: move description section up
3980 init, clone: support --separate-git-dir for .git file
3982 Nicolas Morey-Chaisemartin (1):
3983 submodule: process conflicting submodules only once
3986 Documentation: trivial grammar fix in core.worktree description
3989 Makefile: Cover more files with make check
3990 sparse: Fix errors and silence warnings
3992 Ævar Arnfjörð Bjarmason (70):
3993 i18n: git-init basic messages
3994 i18n: git-init "Initialized [...] repository" message
3995 i18n: git-clone basic messages
3996 i18n: git-clone "Cloning into" message
3997 i18n: git-clone "Cloning into" message
3998 i18n: git-add basic messages
3999 i18n: git-add "The following paths are ignored" message
4000 i18n: git-add "did not match any files" message
4001 i18n: git-add "remove '%s'" message
4002 i18n: git-add "Unstaged changes" message
4003 i18n: git-branch basic messages
4004 i18n: git-branch "remote branch '%s' not found" message
4005 i18n: git-branch "Deleted branch [...]" message
4006 i18n: git-branch "git branch -v" messages
4007 i18n: git-branch "(no branch)" message
4008 i18n: git-checkout basic messages
4009 i18n: git-checkout: our/their version message
4010 i18n: git-checkout describe_detached_head messages
4011 i18n: git-checkout "HEAD is now at" message
4012 i18n: git-checkout "Switched to a .. branch" message
4013 i18n: git-commit basic messages
4014 i18n: git-commit "middle of a merge" message
4015 i18n: git-commit formatting messages
4016 i18n: git-commit print_summary messages
4017 i18n: git-commit "enter the commit message" message
4018 i18n: git-commit advice messages
4019 i18n: git-diff basic messages
4020 i18n: git-fetch basic messages
4021 i18n: git-fetch formatting messages
4022 i18n: git-fetch update_local_ref messages
4023 i18n: git-fetch split up "(non-fast-forward)" message
4024 i18n: git-grep basic messages
4025 i18n: git-grep "--open-files-in-pager" message
4026 i18n: git-log basic messages
4027 i18n: git-log "--OPT does not make sense" messages
4028 i18n: git-merge basic messages
4029 i18n: git-merge "Updating %s..%s" message
4030 i18n: git-merge "You have not concluded your merge" messages
4031 i18n: git-merge "Wonderful" message
4032 i18n: git-mv basic messages
4033 i18n: git-mv "bad" messages
4034 i18n: git-rm basic messages
4035 i18n: git-reset basic messages
4036 i18n: git-reset reset_type_names messages
4037 i18n: git-reset "Unstaged changes after reset" message
4038 i18n: git-tag basic messages
4039 i18n: git-tag tag_template message
4040 i18n: git-push basic messages
4041 i18n: git-push "prevent you from losing" message
4042 i18n: git-status basic messages
4043 i18n: git-status "nothing to commit" messages
4044 i18n: git-status shortstatus messages
4045 i18n: git-status "Changes to be committed" message
4046 i18n: git-status "Initial commit" message
4047 i18n: git-status "renamed: " message
4048 i18n: git-archive basic messages
4049 i18n: git-bundle basic messages
4050 i18n: git-clean basic messages
4051 i18n: git-clean clean.requireForce messages
4052 i18n: git-describe basic messages
4053 i18n: git-gc basic messages
4054 i18n: git-gc "Auto packing the repository" message
4055 i18n: git-notes basic commands
4056 i18n: git-notes GIT_NOTES_REWRITE_MODE error message
4057 i18n: git-revert basic messages
4058 i18n: git-revert "Your local changes" message
4059 i18n: git-revert literal "me" messages
4060 i18n: git-revert split up "could not revert/apply" message
4061 i18n: git-shortlog basic messages
4062 t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
4065 Version v1.7.5-rc0; changes since v1.7.4.5:
4066 -------------------------------------------
4069 git-gui: update russian translation
4070 git-gui: update russian translation
4072 Alexandre Erwin Ittner (1):
4073 git-gui: add Brazilian Portuguese (pt-BR) translation
4076 git-gui: fix ANSI-color parsing
4077 git-gui: respect conflict marker size
4078 git-gui: fix browsers [Up To Parent] in sub-sub-directories.
4079 git-gui: Fix use of renamed tag.
4080 git-gui: Fix use of hunk tag for non-hunk content.
4081 git-gui: fix typo in image data
4082 git-gui: remove 'no such variable' for s error when encounter unknown file states
4083 git-gui: learn more type change states
4084 git-gui: rework handling of diff header
4085 git-gui: handle index lines only in the diff header
4086 git-gui: name also new symlinks so
4087 git-gui: there is no "mode *" diff header line
4088 git-gui: move 3way diff autodetect up
4089 git-gui: always reset the current tag
4090 git-gui: handle special content lines only in the diff header section
4091 git-gui: handle meta diff header lines only in the header section
4093 Carlo Marcelo Arenas Belon (1):
4094 setup: translate symlinks in filename when using absolute paths
4096 Carlos Martín Nieto (1):
4097 Name make_*_path functions more accurately
4100 vcs-svn: Allow simple v3 dumps (no deltas yet)
4101 vcs-svn: Implement Prop-delta handling
4102 fast-import: add 'ls' command
4103 vcs-svn: use strbuf for revision log
4104 vcs-svn: use strbuf for author, UUID, and URL
4105 vcs-svn: implement perfect hash for node-prop keys
4106 vcs-svn: implement perfect hash for top-level keys
4107 vcs-svn: use strchr to find RFC822 delimiter
4110 Documentation: "rebase <onto> <that>" stays on <that> branch upon exit
4113 Make rev-list --objects work together with pathspecs
4114 Add testcases showing how pathspecs are handled with rev-list --objects
4117 alias: use run_command api to execute aliases
4119 Giuseppe Bilotta (1):
4120 Improve test for pthreads flag
4123 git gui: keep selected branch when remote is changed in push dialog
4124 git-gui: scroll down to default selection for push dialog
4125 git-gui: instead of defaulting to home directory use working directory
4126 mingw: move unlink wrapper to mingw.c
4127 mingw: work around irregular failures of unlink on windows
4128 mingw: make failures to unlink or move raise a question
4129 mingw: add fallback for rmdir in case directory is in use
4130 git-gui: fix deleting item from all_remotes variable
4131 git-gui: always default to the last merged branch in remote delete
4132 git-gui: refactor remote submenu creation into subroutine
4133 git-gui: teach fetch/prune menu to do it for all remotes
4134 git-gui: fetch/prune all entry only for more than one entry
4135 git-gui: fetch/prune all entry appears last
4138 Obey p4 views when using client spec
4141 object.h: Remove obsolete struct object_refs
4142 git-completion: Add git help completion for aliases
4145 gitweb: Make i18n (encoding) tests in t9500 leave clean state
4148 git-checkout.txt: improve detached HEAD documentation
4149 Introduce CHERRY_PICK_HEAD
4150 bash: teach __git_ps1 about CHERRY_PICK_HEAD
4151 Teach commit about CHERRY_PICK_HEAD
4154 merge: improve inexact rename limit warning
4155 bump rename limit defaults (again)
4156 commit: stop setting rename limit
4157 add inexact rename detection progress infrastructure
4158 merge: enable progress reporting for rename detection
4159 pull: propagate --progress to merge
4160 compat: provide a fallback va_copy definition
4161 strbuf: add strbuf_vaddf
4162 trace: add trace_vprintf
4163 trace: refactor to support multiple env variables
4164 trace: factor out "do we want to trace" logic
4165 trace: add trace_strbuf
4166 add packet tracing debug code
4167 trace: give repo_setup trace its own key
4168 doc: drop author/documentation sections from most pages
4169 doc: add missing git footers
4170 docs: point git.txt author credits to git-scm.com
4171 checkout: add basic tests for detached-orphan warning
4172 checkout: clear commit marks after detached-orphan check
4173 checkout: tweak detached-orphan warning format
4174 t7607: mark known breakage in test 11 as fixed
4175 t7607: clean up stray untracked file
4176 tests: kill backgrounded processes more robustly
4179 tests: fix overeager scrubbing of environment variables
4181 Johannes Schindelin (2):
4182 mingw_rmdir: set errno=ENOTEMPTY when appropriate
4183 Remove unused variables
4186 rerere forget: deprecate invocation without pathspec
4188 Jonathan Nieder (75):
4189 vcs-svn: Check for errors from open()
4190 vcs-svn: Eliminate node_ctx.srcRev global
4191 vcs-svn: Eliminate node_ctx.mark global
4192 vcs-svn: Unclutter handle_node by introducing have_props var
4193 vcs-svn: Use mark to indicate nodes with included text
4194 vcs-svn: handle_node: Handle deletion case early
4195 vcs-svn: Replace = Delete + Add
4196 vcs-svn: Combine repo_replace and repo_modify functions
4197 vcs-svn: Delay read of per-path properties
4198 vcs-svn: Reject path nodes without Node-action
4199 vcs-svn: More dump format sanity checks
4200 vcs-svn: Make source easier to read on small screens
4201 vcs-svn: Split off function for handling of individual properties
4202 vcs-svn: Sharpen parsing of property lines
4203 vcs-svn: Allow change nodes for root of tree (/)
4204 cherry-pick/revert: add support for -X/--strategy-option
4205 unpack-trees: handle lstat failure for existing directory
4206 unpack-trees: handle lstat failure for existing file
4207 userdiff: simplify word-diff safeguard
4208 t4034 (diff --word-diff): style suggestions
4209 glossary: define pathspec
4210 checkout: split off a function to peel away branchname arg
4211 checkout: rearrange update_refs_for_switch for clarity
4212 t3507: introduce pristine-detach helper
4213 checkout: add missing const to describe_detached_head
4214 update-index --refresh --porcelain: add missing const
4215 vcs-svn: eliminate global byte_buffer
4216 vcs-svn: replace buffer_read_string memory pool with a strbuf
4217 vcs-svn: collect line_buffer data in a struct
4218 vcs-svn: teach line_buffer to handle multiple input files
4219 vcs-svn: make test-line-buffer input format more flexible
4220 tests: give vcs-svn/line_buffer its own test script
4221 vcs-svn: tweak test-line-buffer to not assume line-oriented input
4222 t0081 (line-buffer): add buffering tests
4223 vcs-svn: add binary-safe read function
4224 vcs-svn: allow character-oriented input
4225 vcs-svn: allow input from file descriptor
4226 vcs-svn: teach line_buffer about temporary files
4227 fast-import: make code "-Wpointer-arith" clean
4228 vcs-svn: introduce repo_read_path to check the content at a path
4229 vcs-svn: handle_node: use repo_read_path
4230 vcs-svn: simplify repo_modify_path and repo_copy
4231 vcs-svn: allow input errors to be detected promptly
4232 compat: fall back on __va_copy if available
4233 wt-status: add helpers for printing wt-status lines
4234 commit: refer to commit template as s->fp
4235 commit, status: use status_printf{,_ln,_more} helpers
4236 i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
4237 wt-status: add helpers for printing wt-status lines
4238 commit: refer to commit template as s->fp
4239 commit, status: use status_printf{,_ln,_more} helpers
4240 i18n: add stub Q_() wrapper for ngettext
4241 i18n: "make distclean" should clean up after "make pot"
4242 tests: stop worrying about obsolete environment variables
4243 tests: suppress system gitattributes
4244 gitattributes: drop support for GIT_ATTR_NOGLOBAL
4245 config: drop support for GIT_CONFIG_NOGLOBAL
4246 tests: scrub environment of GIT_* variables
4247 declare 1-bit bitfields to be unsigned
4248 vcs-svn: remove spurious semicolons
4249 mktag: avoid %td in format string
4250 unbreak and eliminate NO_C99_FORMAT
4251 run-command: prettify -D_FORTIFY_SOURCE workaround
4252 vcs-svn: improve support for reading large files
4253 vcs-svn: make buffer_skip_bytes return length read
4254 vcs-svn: make buffer_copy_bytes return length read
4255 vcs-svn: improve reporting of input errors
4256 tests: avoid nonportable {foo,bar} glob
4257 vcs-svn: make reading of properties binary-safe
4258 vcs-svn: remove buffer_read_string
4259 vcs-svn: avoid unnecessary copying of log message and author
4260 vcs-svn: handle log message with embedded NUL
4261 vcs-svn: add missing cast to printf argument
4262 vcs-svn: add missing cast to printf argument
4263 tests: make sure input to sed is newline terminated
4265 Junio C Hamano (29):
4266 unpack-trees.c: cosmetic fix
4267 unpack_trees(): skip trees that are the same in all input
4268 t4034 (diff --word-diff): add a minimum Perl drier test vector
4269 t6004: add pathspec globbing test for log family
4270 checkout: introduce --detach synonym for "git checkout foo^{commit}"
4271 Rename t2019 with typo "amiguous" that meant "ambiguous"
4272 Revert "unpack_trees(): skip trees that are the same in all input"
4273 grep --no-index: honor pathspecs correctly
4274 rev-list: --left/right-only are mutually exclusive
4275 commit: give final warning when reattaching HEAD to leave commits behind
4276 Start preparing release notes to 1.7.5
4277 Update Release Notes to 1.7.5
4278 Update draft release notes to 1.7.5
4279 refs_from_alternate: helper to use refs from alternates
4280 fetch-pack: objects in our alternates are available to us
4281 fetch-pack: factor out hardcoded handshake window size
4282 fetch-pack: progressively use larger handshake windows
4283 fetch-pack: use smaller handshake window for initial request
4284 Update drart release notes to 1.7.5
4285 Update draft release notes to 1.7.5
4286 rerere: make sure it works even in a workdir attached to a young repository
4287 Update draft release note to 1.7.5
4288 Revert "upload-pack: Implement no-done capability"
4289 Revert "fetch-pack: Implement no-done capability"
4290 enable "no-done" extension only when fetching over smart-http
4291 Fix potential local deadlock during fetch-pack
4292 enable "no-done" extension only when serving over smart-http
4293 Revert two "no-done" reverts
4297 gitweb: fix #patchNN anchors when path_info is enabled
4299 Martin von Zweigbergk (2):
4301 mergetool: don't skip modify/remove conflicts
4304 push: better error messages when push.default = tracking
4305 push: better error message when no remote configured
4307 Michael Horowitz (1):
4308 git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
4310 Michael J Gruber (14):
4311 revlist.c: introduce --left/right-only for unsymmetric picking
4312 t6007: Make sure we test --cherry-pick
4313 rev-list: documentation and test for --left/right-only
4314 git-add: make -A description clearer vs. -u
4315 rev-list/log: factor out revision mark generation
4316 revision.c: introduce --cherry-mark
4317 rev-list: documentation and test for --cherry-mark
4318 log --cherry: a synonym
4319 t6007: test rev-list --cherry
4320 git-log: put space after commit mark
4321 RelNotes/1.7.5.txt: typo and language fixes
4322 t6009: use test_commit() from test-lib.sh
4323 revision.c: introduce --min-parents and --max-parents options
4324 rev-list --min-parents,--max-parents: doc, test and completion
4327 vcs-svn: a void function shouldn't try to return something
4329 Nguyễn Thái Ngọc Duy (22):
4331 diff-no-index: use diff_tree_setup_paths()
4332 Convert struct diff_options to use struct pathspec
4333 tree_entry_interesting(): remove dependency on struct diff_options
4334 Move tree_entry_interesting() to tree-walk.c and export it
4335 diff-tree: convert base+baselen to writable strbuf
4336 tree_entry_interesting(): refactor into separate smaller functions
4337 tree_entry_interesting(): support depth limit
4338 tree_entry_interesting(): fix depth limit with overlapping pathspecs
4339 tree_entry_interesting(): support wildcard matching
4340 tree_entry_interesting(): optimize wildcard matching when base is matched
4341 pathspec: add match_pathspec_depth()
4342 struct rev_info: convert prune_data to struct pathspec
4343 Convert ce_path_match() to use struct pathspec
4344 Convert ce_path_match() to use match_pathspec_depth()
4345 grep: convert to use struct pathspec
4346 grep: use match_pathspec_depth() for cache/worktree grepping
4347 grep: use writable strbuf from caller for grep_tree()
4348 grep: drop pathspec_matches() in favor of tree_entry_interesting()
4349 t7810: overlapping pathspecs and depth limit
4350 Make hash-object more robust against malformed objects
4351 git.c: reorder builtin command list
4354 transport-helper.c: fix check for (size_t < 0)
4357 git-gui: Include version check and test for tearoff menu entry
4358 git-gui: detect the use of MUI langauge packs on Windows
4362 git-p4: fix key error for p4 problem
4363 git-p4: add missing newline in initial import message
4364 git-p4: accommodate new move/delete type in p4
4365 git-p4: reinterpret confusing p4 message
4366 git-p4: better message for "git-p4 sync" when not cloned
4367 git-p4: decode p4 wildcard characters
4368 git-p4: support clone --bare
4369 git-p4: fix clone @all regression
4370 git-p4: test clone @all
4371 git-p4: fix sync new branch regression
4372 git-p4: test sync new branch
4374 Piotr Krukowiecki (1):
4375 Documentation: running test with --debug keeps "trash" directory
4377 Ramkumar Ramachandra (1):
4378 fast-import: Introduce --import-marks-if-exists
4381 repo-config: add deprecation warning
4382 grep: read patterns from stdin with -f -
4385 bash: fix misindented esac statement in __git_complete_file()
4386 bash: complete 'git diff ...branc<TAB>'
4388 Sebastian Schuberth (4):
4389 mergetool--lib: Sort tools alphabetically for easier lookup
4390 mergetool--lib: Add Beyond Compare 3 as a tool
4391 mergetool--lib: Sort tools alphabetically for easier lookup
4392 mergetool--lib: Add Beyond Compare 3 as a tool
4395 git-gui: fix russian translation typos
4397 Shawn O. Pearce (6):
4398 smart-http: Don't use Expect: 100-Continue
4399 smart-http: Really never use Expect: 100-continue
4400 fetch-pack: Finish negotation if remote replies "ACK %s ready"
4401 upload-pack: More aggressively send 'ACK %s ready'
4402 fetch-pack: Implement no-done capability
4403 upload-pack: Implement no-done capability
4406 git-gui: spelling fixes in russian translation
4409 git-gui: use --exclude-standard to check for untracked files
4415 Exhibit merge bug that clobbers index&WT
4416 t4034: bulk verify builtin word regex sanity
4419 git-p4: Teach gitConfig method about arguments.
4420 Teach git-p4 to ignore case in perforce filenames if configured.
4421 git-p4: Fix error message crash in P4Sync.commit.
4423 Uwe Kleine-König (2):
4424 get_remote_url(): use the same data source as ls-remote to get remote urls
4425 git-request-pull: open-code the only invocation of get_remote_url
4428 git-p4: Improve rename detection support
4429 git-p4: Add copy detection support
4431 Ævar Arnfjörð Bjarmason (4):
4432 gitignore: add test-mktemp to ignore list
4433 i18n: add no-op _() and N_() wrappers
4434 i18n: add GETTEXT_POISON to simulate unfriendly translator
4435 i18n: Makefile: "pot" target to extract messages marked for translation
4438 Version v1.7.4.5; changes since v1.7.4.4:
4439 -----------------------------------------
4442 t2021: mark a test as fixed
4445 "log --cherry-pick" documentation regression fix
4448 Michael J Gruber (3):
4449 git.txt: fix list continuation
4450 t3306,t5304: avoid clock skew issues
4451 git-svn.txt: Document --mergeinfo
4454 archive: document limitation of tar.umask config setting
4457 Version v1.7.4.4; changes since v1.7.4.3:
4458 -----------------------------------------
4461 git-instaweb: Change how gitweb.psgi is made runnable as standalone app
4462 gitweb: Fix parsing of negative fractional timezones in JavaScript
4465 strbuf: add fixed-length version of add_wrapped_text
4466 format-patch: wrap long header lines
4467 format-patch: rfc2047-encode newlines in headers
4468 pull: do not clobber untracked files on initial pull
4470 Jonathan Nieder (1):
4471 compat: add missing #include <sys/resource.h>
4474 list-objects.c: don't add an unparsed NULL as a pending tree
4475 Rename core.abbrevlength back to core.abbrev
4476 diff/status: refactor opportunistic index update
4477 update $GIT_INDEX_FILE when there are racily clean entries
4478 Start preparing for 1.7.4.4
4482 Sanity-check config variable names
4483 Disallow empty section and variable names
4486 Make the default abbrev length configurable
4489 log: fix --max-count when used together with -S or -G
4491 Michael J Gruber (2):
4492 git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
4493 git-log.txt,rev-list-options.txt: put option blocks in proper order
4495 Nicolas Morey-Chaisemartin (1):
4496 submodule: process conflicting submodules only once
4499 Documentation: trivial grammar fix in core.worktree description
4502 Version v1.7.4.3; changes since v1.7.4.2:
4503 -----------------------------------------
4506 HOME must be set before calling git-init when creating test repositories
4508 Carlos Martín Nieto (1):
4509 Documentation/config.txt: make truth value of numbers more explicit
4511 Clemens Buchacher (1):
4512 do not overwrite untracked symlinks
4515 git-cvsimport.perl: Bail out right away when reading from the server fails
4518 docs: fix filter-branch subdir example for exotic repo names
4521 grep: Add the option '--line-number'
4524 branch/checkout --track: Ensure that upstream branch is indeed a branch
4527 Demonstrate breakage: checkout overwrites untracked symlink with directory
4528 stash: fix incorrect quoting in cleanup of temporary files
4529 stash: copy the index using --index-output instead of cp -p
4532 checkout: fix bug with ambiguous refs
4533 apply: do not patch lines that were already patched
4534 apply -v: show offset count when patch did not apply exactly
4535 diff --quiet: disable optimization when --diff-filter=X is used
4536 doc: technical details about the index file format
4537 t8001: check the exit status of the command being tested
4538 parse-remote: typofix
4539 Doc: mention --delta-base-offset is the default for Porcelain commands
4543 contrib/thunderbird-patch-inline: do not require bash to run the script
4545 Michael J Gruber (2):
4546 git-bisect.txt: streamline run presentation
4547 git-bisect.txt: example for bisecting with hot-fix
4550 git tag documentation grammar fixes and readability updates
4552 strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
4554 Nguyễn Thái Ngọc Duy (1):
4555 doc: technical details about the index file format
4557 Piotr Krukowiecki (2):
4558 git stash: show status relative to current directory
4559 Add test: git stash shows status relative to current dir
4562 parse-remote: replace unnecessary sed invocation
4563 git-pack-objects.txt: fix grammatical errors
4566 Version v1.7.4.2; changes since v1.7.4.1:
4567 -----------------------------------------
4570 diff format documentation: clarify --cc and -c
4573 Documentation: remove redundant colons in git-for-each-ref.txt
4574 Add Author and Documentation sections to git-for-each-ref.txt
4575 docs: fix grammar in gitattributes.txt
4578 Improve error messages when temporary file creation fails
4581 Work around broken ln on solaris as used in t8006
4583 Carlos Martín Nieto (3):
4584 valgrind: ignore SSE-based strlen invalid reads
4585 make_absolute_path: return the input path if it points to our buffer
4586 t/README: Add a note about running commands under valgrind
4588 Clemens Buchacher (1):
4589 Documentation: clarify -u<mode> option defaults
4592 branch_merged: fix grammar in warning
4595 mingw: add minimum getrlimit() compatibility stub
4598 gitweb: Always call parse_date with timezone parameter
4599 gitweb: Fix handling of fractional timezones in parse_date
4602 merge: honor prepare-commit-msg hook
4605 string_list_append: always set util pointer to NULL
4606 clone: die when trying to clone missing local path
4607 diff: handle diffstat of rewritten binary files
4608 diff: don't retrieve binary blobs for diffstat
4609 bisect: visualize with git-log if gitk is unavailable
4612 push.default: Rename 'tracking' to 'upstream'
4614 Jonathan Nieder (9):
4615 correct type of EMPTY_TREE_SHA1_BIN
4616 tests: skip terminal output tests on OS X
4617 commit: error out for missing commit message template
4618 enums: omit trailing comma for portability
4619 compat: make gcc bswap an inline function
4620 standardize brace placement in struct definitions
4621 branch: split off function that writes tracking info and commit subject
4622 cherry: split off function to print output lines
4623 diff --submodule: split into bite-sized pieces
4626 CodingGuidelines: downcase placeholders in usage messages
4627 verify-pack: add --stat-only to the synopsis section
4628 SubmittingPatches: clarify the expected commit log description
4629 Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
4630 Prepare draft release notes to 1.7.4.2
4631 bisect: explain the rationale behind 125
4632 Update draft release notes to 1.7.4.2
4636 gitweb: highlight: replace tabs with spaces
4639 for_each_hash: allow passing a 'void *data' pointer to callback
4640 diffcore-rename: properly honor the difference between -M and -C
4641 diffcore-rename: improve estimate_similarity() heuristics
4643 Masatake Osanai (1):
4644 perl: command_bidi_pipe() method should set-up git environmens
4646 Mathias Lafeldt (1):
4647 Fix typo in t/README
4649 Michael J Gruber (16):
4650 commit,tag: use same wording for -F
4651 commit,status: describe --porcelain just like push
4652 clone,init: describe --template using the same wording
4653 commit,merge,tag: describe -m likewise
4654 add: describe --patch like checkout, reset
4655 commit,status: describe -u likewise
4656 git-tag.txt: list all modes in the description
4657 pull: do not display fetch usage on --help-all
4658 Make <identifier> lowercase as per CodingGuidelines
4659 Make <identifier> lowercase as per CodingGuidelines
4660 Make <identifier> lowercase as per CodingGuidelines
4661 Make <identifier> lowercase in Documentation
4662 git-patch-id: test for "no newline" markers
4663 git-patch-id: do not trip over "no newline" markers
4664 mergetool-lib: call vim in readonly mode for diffs
4665 rev-list-options.txt: typo fix
4668 Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
4669 git-compat-util.h: Honor HP C's noreturn attribute
4671 Michał Kiedrowicz (1):
4672 Documentation: fix a typo in git-apply.txt
4674 Nguyễn Thái Ngọc Duy (2):
4675 parse_tag_buffer(): do not prefixcmp() out of range
4676 init: remove unnecessary check
4678 Piotr Krukowiecki (1):
4679 ls-remote documentation: <refs> argument is optional
4681 Ralf Wildenhues (1):
4682 configure: use AC_LANG_PROGRAM consistently
4685 git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
4687 Shawn O. Pearce (2):
4688 Limit file descriptors used by packs
4689 sha1_file.c: Don't retain open fds on small packs
4691 Spencer E. Olson (2):
4692 submodule: no [--merge|--rebase] when newly cloned
4693 t7406: "git submodule update {--merge|--rebase]" with new submodules
4695 Ævar Arnfjörð Bjarmason (4):
4696 gitweb/gitweb.perl: remove use of qw(...) as parentheses
4697 gitweb/gitweb.perl: don't call S_ISREG() with undef
4698 t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
4699 t/t7500-commit.sh: use test_cmp instead of test
4702 Version v1.7.4.1; changes since v1.7.4:
4703 ---------------------------------------
4706 clone: fixup recurse_submodules option
4709 gitweb: Mention optional Perl modules in INSTALL
4712 t5526: Fix wrong argument order in "git config"
4713 pull: Document the "--[no-]recurse-submodules" options
4716 start_command: flush buffers in the WIN32 code path as well
4717 t4120-apply-popt: help systems with core.filemode=false
4719 Jonathan Nieder (5):
4720 quote.h: simplify the inclusion
4721 fast-import: clarify documentation of "feature" command
4722 fast-import: introduce "feature notes" command
4723 compat: helper for detecting unsigned overflow
4724 svn-fe: warn about experimental status
4727 fsck: drop unused parameter from traverse_one_object()
4728 fsck: do not give up too early in fsck_dir()
4731 Nguyễn Thái Ngọc Duy (4):
4732 diff: support --cached on unborn branches
4733 Add const to parse_{commit,tag}_buffer()
4734 sha1_file.c: move find_cached_object up so sha1_object_info can use it
4735 sha1_object_info: examine cached_object store too
4738 t3509: use unconstrained initial test to setup repository.
4739 t7407: fix line endings for mingw build
4741 Shawn O. Pearce (1):
4742 bundle: Use OFS_DELTA in bundle files
4744 Sitaram Chamarty (1):
4745 post-receive-email: suppress error if description file missing
4747 Uwe Kleine-König (1):
4748 Documentation/merge subtree How-To: fix typo
4751 Version v1.7.4; changes since v1.7.4-rc3:
4752 -----------------------------------------
4755 Don't pass "--xhtml" to hightlight in gitweb.perl script.
4758 rebase: use explicit "--" with checkout
4759 rebase: give a better error message for bogus branch
4760 tests: sanitize more git environment variables
4762 Jonathan Nieder (2):
4763 fast-import: treat filemodify with empty tree as delete
4764 rebase -i: clarify in-editor documentation of "exec"
4770 Version v1.7.4-rc3; changes since v1.7.4-rc2:
4771 ---------------------------------------------
4774 userdiff: match Pascal class methods
4776 Björn Steinbrink (1):
4777 Correctly report corrupted objects
4780 exec_cmd: remove unused extern
4783 Fix expected values of setup tests on Windows
4784 t/README: hint about using $(pwd) rather than $PWD in tests
4786 Jonathan Nieder (9):
4787 ll-merge: simplify opts == NULL case
4788 Documentation/fast-import: capitalize beginning of sentence
4789 remote-ext: do not segfault for blank lines
4790 Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
4791 tests: cosmetic improvements to the repo-setup test
4792 tests: compress the setup tests
4793 Documentation: do not treat reset --keep as a special case
4794 Subject: setup: officially support --work-tree without --git-dir
4795 t1510: fix typo in the comment of a test
4798 Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
4801 Ramsay Allan Jones (1):
4802 svndump.c: Fix a printf format compiler warning
4805 Version v1.7.4-rc2; changes since v1.7.4-rc1:
4806 ---------------------------------------------
4809 Mark gitk script executable
4812 trace.c: ensure NULL is not passed to printf
4813 t0001,t1510,t3301: use sane_unset which always returns with status 0
4814 t3032: limit sed branch labels to 8 characters
4817 docs: explain diff.*.binary option
4819 Jonathan Nieder (3):
4820 diff: funcname and word patterns for perl
4821 gitweb: make logo optional
4822 t9010: svnadmin can fail even if available
4825 userdiff/perl: catch BEGIN/END/... and POD as headers
4829 commit: suggest --amend --reset-author to fix commiter identity
4831 Michael J Gruber (1):
4832 RelNotes/1.7.4: minor fixes
4834 Ramsay Allan Jones (7):
4835 lib-git-svn.sh: Move web-server handling code into separate function
4836 t9157-*.sh: Add an svn version check
4837 t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
4838 t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
4839 t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
4840 t4135-*.sh: Skip the "backslash" tests on cygwin
4841 t9157-*.sh: Make the svn version check more precise
4844 git svn: fix the final example in man page
4847 gitweb: add extensions to highlight feature map
4848 gitweb: remove unnecessary test when closing file descriptor
4851 Documentation/git-archive: spell --worktree-attributes correctly
4852 Documentation/githooks: post-rewrite-copy-notes never existed
4853 submodule: fix relative url parsing for scp-style origin
4854 t0000: quote TAP snippets in test code
4857 Version v1.7.4-rc1; changes since v1.7.4-rc0:
4858 ---------------------------------------------
4861 t/t9001-send-email.sh: fix '&&' chain in some tests
4863 Jonathan Nieder (3):
4864 vcs-svn: Error out for v3 dumps
4865 gitweb: skip logo in atom feed when there is none
4866 daemon: support <directory> arguments again
4869 t0021: avoid getting filter killed with SIGPIPE
4873 Michael J Gruber (2):
4874 cvsimport: partial whitespace cleanup
4875 cvsimport: handle the parsing of uppercase config options
4878 convert filter: supply path to external driver
4880 Ralf Wildenhues (1):
4881 Fix typos in the documentation
4883 Robin H. Johnson (1):
4884 t9001: Fix test prerequisites
4887 Version v1.7.4-rc0; changes since v1.7.3.5:
4888 -------------------------------------------
4891 status: show branchname with a configurable color
4893 Alexander Sulfrian (2):
4894 daemon: add helper function named_sock_setup
4895 daemon: allow more than one host address given via --listen
4897 Alexandre Erwin Ittner (1):
4898 gitk: Add Brazilian Portuguese (pt-BR) translation
4901 describe: Use for_each_rawref
4902 describe: Do not use a flex array in struct commit_name
4903 describe: Store commit_names in a hash table by commit SHA1
4904 describe: Delay looking up commits until searching for an inexact match
4907 git-send-email.perl: make initial In-Reply-To apply only to first email
4910 diffcore-pickaxe.c: a void function shouldn't try to return something
4911 Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
4912 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
4914 Brian Gernhardt (1):
4915 t6022: Use -eq not = to test output of wc -l
4917 Christopher Wilson (1):
4918 Enable highlight executable path as a configuration option
4920 Clemens Buchacher (6):
4921 t7607: use test-lib functions and check MERGE_HEAD
4922 t7607: add leading-path tests
4923 add function check_ok_to_remove()
4924 lstat_cache: optionally return match_len
4925 do not overwrite files in leading path
4926 use persistent memory for rejected paths
4929 mergetool-lib: combine vimdiff and gvimdiff run blocks
4930 mergetool-lib: add a three-way diff view for vim/gvim
4931 mergetool-lib: make the three-way diff the default for vim/gvim
4934 fast-import: Allow filemodify to set the root
4935 fast-import: insert new object entries at start of hash bucket
4936 fast-import: let importers retrieve blobs
4939 Document pre-condition for tree_entry_interesting
4940 tree-walk: Correct bitrotted comment about tree_entry()
4941 tree_entry_interesting(): Make return value more specific
4942 diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
4943 t3509: Add rename + D/F conflict testcase that recursive strategy fails
4944 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
4945 t6032: Add a test checking for excessive output from merge
4946 t6022: Add test combinations of {content conflict?, D/F conflict remains?}
4947 t6022: Add tests for reversing order of merges when D/F conflicts present
4948 t6022: Add tests with both rename source & dest involved in D/F conflicts
4949 t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
4950 t6022: Add tests for rename/rename combined with D/F conflicts
4951 t6020: Modernize style a bit
4952 t6020: Add a testcase for modify/delete + directory/file conflict
4953 t6036: Test index and worktree state, not just that merge fails
4954 t6036: Add a second testcase similar to the first but with content changes
4955 t6036: Add testcase for undetected conflict
4956 merge-recursive: Small code clarification -- variable name and comments
4957 merge-recursive: Rename conflict_rename_rename*() for clarity
4958 merge-recursive: Nuke rename/directory conflict detection
4959 merge-recursive: Move rename/delete handling into dedicated function
4960 merge-recursive: Move delete/modify handling into dedicated function
4961 merge-recursive: Move process_entry's content merging into a function
4962 merge-recursive: New data structures for deferring of D/F conflicts
4963 merge-recursive: New function to assist resolving renames in-core only
4964 merge-recursive: Have process_entry() skip D/F or rename entries
4965 merge-recursive: Structure process_df_entry() to handle more cases
4966 merge-recursive: Update conflict_rename_rename_1to2() call signature
4967 merge-recursive: Update merge_content() call signature
4968 merge-recursive: Avoid doubly merging rename/add conflict contents
4969 merge-recursive: Move handling of double rename of one file to two
4970 merge-recursive: Move handling of double rename of one file to other file
4971 merge-recursive: Delay handling of rename/delete conflicts
4972 merge-recursive: Delay content merging for renames
4973 merge-recursive: Delay modify/delete conflicts if D/F conflict present
4974 conflict_rename_delete(): Check whether D/F conflicts are still present
4975 conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
4976 merge_content(): Check whether D/F conflicts are still present
4977 handle_delete_modify(): Check whether D/F conflicts are still present
4978 merge-recursive: Make room for directories in D/F conflicts
4979 merge-recursive: Remove redundant path clearing for D/F conflicts
4980 t4017 (diff-retval): replace manual exit code check with test_expect_code
4981 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
4982 t4002 (diff-basic): use test_might_fail for commands that might fail
4983 t4202 (log): Replace '<git-command> || :' with test_might_fail
4984 t4019 (diff-wserror): add lots of missing &&
4985 t4026 (color): remove unneeded and unchained command
4986 t5602 (clone-remote-exec): add missing &&
4987 t6016 (rev-list-graph-simplify-history): add missing &&
4988 t7001 (mv): add missing &&
4989 t7601 (merge-pull-config): add missing &&
4990 t7800 (difftool): add missing &&
4991 Introduce sane_unset and use it to ensure proper && chaining
4994 Side-step sed line-ending "corruption" leading to t6038 failure.
4995 Side-step MSYS-specific path "corruption" leading to t5560 failure.
4996 Fix 'clone' failure at DOS root directory.
4997 Fix Windows-specific macro redefinition warning.
4998 Add MinGW-specific execv() override.
5000 Erik Faye-Lund (20):
5001 mingw: do not crash on open(NULL, ...)
5002 inet_ntop: fix a couple of old-style decls
5004 mingw: support waitpid with pid > 0 and WNOHANG
5005 mingw: add kill emulation
5006 daemon: use run-command api for async serving
5007 daemon: use full buffered mode for stderr
5008 daemon: get remote host address from root-process
5009 mingw: import poll-emulation from gnulib
5010 mingw: use poll-emulation from gnulib
5011 daemon: use socklen_t
5012 daemon: make --inetd and --detach incompatible
5013 daemon: opt-out on features that require posix
5014 msvc: opendir: fix malloc-failure
5015 msvc: opendir: allocate enough memory
5016 msvc: opendir: do not start the search
5017 win32: dirent: handle errors
5018 msvc: opendir: handle paths ending with a slash
5019 win32: use our own dirent.h
5020 help: always suggest common-cmds if prefix of cmd
5022 Giuseppe Bilotta (15):
5023 gitweb: use fullname as hash_base in heads link
5024 gitweb: introduce remote_heads feature
5025 gitweb: git_get_heads_list accepts an optional list of refs
5026 gitweb: separate heads and remotes lists
5027 gitweb: nagivation menu for tags, heads and remotes
5028 gitweb: allow action specialization in page header
5029 gitweb: remotes view for a single remote
5030 gitweb: refactor repository URL printing
5031 gitweb: provide a routine to display (sub)sections
5032 gitweb: group remote heads by remote
5033 git instaweb: enable remote_heads
5034 web--browse: coding style
5035 web--browse: split valid_tool list
5036 web--browse: support opera, seamonkey and elinks
5037 web--browse: better support for chromium
5040 Allow creation of arbitrary git-shell commands
5041 Add interactive mode to git-shell for user-friendliness
5042 Add sample commands for git-shell
5043 shell: Display errors from improperly-formatted command lines
5045 Ilari Liusvaara (4):
5046 Add bidirectional_transfer_loop()
5049 remote-fd/ext: finishing touches after code review
5051 Jakub Narebski (12):
5052 t/gitweb-lib.sh: Use GIT_BUILD_DIR
5053 t/gitweb-lib.sh: Use tabs for indent consistently
5054 gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
5055 t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
5056 gitweb/Makefile: Add 'test' and 'test-installed' targets
5057 gitweb/Makefile: Include gitweb/config.mak
5058 gitweb: Fix test of highlighting support in t9500
5059 gitweb: Fix bug in evaluate_path_info
5060 gitweb: Improve behavior for actionless path_info gitweb URLs
5061 gitweb: Time::HiRes is in core for Perl 5.8
5062 gitweb: selectable configurations that change with each request
5063 gitweb: Fix handling of whitespace in generated links
5066 read-tree: deprecate syntax without tree-ish args
5069 tests: factor out terminal handling from t7006
5070 tests: test terminal output to both stdout and stderr
5071 push: pass --progress down to git-pack-objects
5072 config: treat non-existent config files as empty
5073 diff: report bogus input to -C/-M/-B
5074 docs: clarify git diff modes of operation
5075 allow command-specific pagers in pager.<cmd>
5076 docs: default to more modern toolset
5077 default color.status.branch to "same as header"
5078 tests: add some script lint checks
5079 tests: flip executable bit on t9158
5080 handle arbitrary ints in git_config_maybe_bool
5081 t2107: mark passing test as success
5084 clone: Add the --recurse-submodules option as alias for --recursive
5085 fetch/pull: Add the --recurse-submodules option
5086 Add the 'fetch.recurseSubmodules' config setting
5087 Submodules: Add the "fetchRecurseSubmodules" config option
5088 git submodule: Remove now obsolete tests before cloning a repo
5091 git-send-email.perl: Add --to-cmd
5094 notes.c: Hexify SHA1 in die() message from init_notes()
5095 (trivial) notes.h: Minor documentation fixes to copy_notes()
5096 notes.h: Make default_notes_ref() available in notes API
5097 notes.c: Reorder functions in preparation for next commit
5098 notes.h/c: Allow combine_notes functions to remove notes
5099 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
5100 (trivial) t3303: Indent with tabs instead of spaces for consistency
5101 notes.c: Use two newlines (instead of one) when concatenating notes
5102 builtin/notes.c: Split notes ref DWIMmery into a separate function
5103 git notes merge: Initial implementation handling trivial merges only
5104 builtin/notes.c: Refactor creation of notes commits.
5105 git notes merge: Handle real, non-conflicting notes merges
5106 git notes merge: Add automatic conflict resolvers (ours, theirs, union)
5107 Documentation: Preliminary docs on 'git notes merge'
5108 git notes merge: Manual conflict resolution, part 1/2
5109 git notes merge: Manual conflict resolution, part 2/2
5110 git notes merge: List conflicting notes in notes merge commit message
5111 git notes merge: --commit should fail if underlying notes ref has moved
5112 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
5113 git notes merge: Add testcases for merging notes trees at different fanouts
5114 Provide 'git notes get-ref' to easily retrieve current notes ref
5115 cmd_merge(): Parse options before checking MERGE_HEAD
5116 Provide 'git merge --abort' as a synonym to 'git reset --merge'
5118 Johannes Schindelin (1):
5119 merge-octopus: Work around environment issue on Windows
5122 t7300: add a missing SYMLINKS prerequisite
5123 apply --whitespace=fix: fix tab-in-indent
5124 Make the tab width used for whitespace checks configurable
5125 Avoid duplicate test number t7609
5127 Jonathan Nieder (52):
5128 merge-recursive: expose merge options for builtin merge
5129 ll-merge: replace flag argument with options struct
5130 commit-tree: free commit message before exiting
5131 test-lib: allow test code to check the list of declared prerequisites
5132 test_terminal: catch use without TTY prerequisite
5133 test_terminal: ensure redirections work reliably
5134 fast-import: filemodify after M 040000 <tree> "" crashes
5135 fast-import: tighten M 040000 syntax
5136 t9300 (fast-import): another test for the "replace root" feature
5137 fast-import: do not clear notes in do_change_note_fanout()
5138 user-manual: remote-tracking can be checked out, with detached HEAD
5139 tests: add missing &&
5140 tests: add missing &&, batch 2
5141 test-lib: introduce test_line_count to measure files
5142 t6022 (renaming merge): chain test commands with &&
5143 t1502 (rev-parse --parseopt): test exit code from "-h"
5144 t1400 (update-ref): use test_must_fail
5145 t3301 (notes): use test_expect_code for clarity
5146 t3404 (rebase -i): unroll test_commit loops
5147 t3404 (rebase -i): move comment to description
5148 t3404 (rebase -i): introduce helper to check position of HEAD
5149 t4124 (apply --whitespace): use test_might_fail
5150 wrapper: move xmmap() to sha1_file.c
5151 wrapper: move odb_* to environment.c
5152 path helpers: move git_mkstemp* to wrapper.c
5153 strbuf: move strbuf_branchname to sha1_name.c
5154 wrapper: give zlib wrappers their own translation unit
5155 pack-objects: mark file-local variable static
5156 Remove pack file handling dependency from wrapper.o
5157 Describe various forms of "be quiet" using OPT__QUIET
5158 fast-import: treat SIGUSR1 as a request to access objects early
5159 git-rev-parse.txt: clarify --git-dir
5160 gitweb: document $per_request_config better
5161 fast-import: stricter parsing of integer options
5162 fast-import: clarify documentation of "feature" command
5163 fast-import: Allow cat-blob requests at arbitrary points in stream
5164 git submodule -b ... of current HEAD fails
5165 Makefile: dependencies for vcs-svn tests
5166 parse-options: clearer reporting of API misuse
5167 parse-options: move NODASH sanity checks to parse_options_check
5168 parse-options: sanity check PARSE_OPT_NOARG flag
5169 parse-options: never suppress arghelp if LITERAL_ARGHELP is set
5170 parse-options: allow git commands to invent new option types
5171 parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
5172 update-index: migrate to parse-options API
5173 treap: make treap_insert return inserted node
5174 vcs-svn: fix intermittent repo_tree corruption
5175 Makefile: transport-helper uses thread-utils.h
5176 t9300: avoid short reads from dd
5177 bash: simple reimplementation of _get_comp_words_by_ref
5178 t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
5179 t0001: test git init when run via an alias
5182 Add string comparison functions that respect the ignore_case variable.
5183 Case insensitivity support for .gitignore via core.ignorecase
5184 Add case insensitivity support for directories when using git status
5185 Add case insensitivity support when using git ls-files
5186 Support case folding for git add when core.ignorecase=true
5187 Support case folding in git fast-import when core.ignorecase=true
5189 Junio C Hamano (31):
5190 gitdiffcore doc: update pickaxe description
5191 diff: pass the entire diff-options to diffcore_pickaxe()
5192 git log/diff: add -G<regexp> that greps in the patch text
5193 diff/log -G<pattern>: tests
5194 grep: move logic to compile header pattern into a separate helper
5195 log --author: take union of multiple "author" requests
5196 disallow branch names that start with a hyphen
5198 merge-recursive: Restructure showing how to chain more process_* functions
5199 Martin Langhoff has a new e-mail address
5200 Make test script t9157 executable
5201 merge-recursive:make_room_for_directories - work around dumb compilers
5202 core.abbrevguard: Ensure short object names stay unique a bit longer
5203 read_sha1_file(): report correct name of packfile with a corrupt object
5204 A loose object is not corrupt if it cannot be read due to EMFILE
5205 t9001: send-email interation with --in-reply-to and --chain-reply-to
5206 t3404: do not use 'describe' to implement test_cmp_rev
5207 Update draft release notes to 1.7.4
5208 Update draft release notes to 1.7.4
5209 t9300: remove unnecessary use of /dev/stdin
5210 t9119: do not compare "Text Last Updated" line from "svn info"
5211 t9010 fails when no svn is available
5212 get_sha1: teach ":$n:<path>" the same relative path logic
5213 Documentation/git.txt: update list of maintenance releases
5214 fetch_populated_submodules(): document dynamic allocation
5215 thread-utils.h: simplify the inclusion
5216 Relnotes: remove items fixed on 'maint'
5217 get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
5218 Update draft release notes to 1.7.4
5219 set_try_to_free_routine(NULL) means "do nothing special"
5223 merge-recursive --patience
5224 merge-recursive: options to ignore whitespace changes
5227 merge-recursive: option to specify rename threshold
5228 diff: add synonyms for -M, -C, -B
5229 completion: Support the DWIM mode for git checkout
5230 blame: Add option to show author email instead of name
5231 submodule: preserve all arguments exactly when recursing
5232 submodule: only preserve flags across recursive status/update invocations
5233 rebase: better rearranging of fixup!/squash! lines with --autosquash
5234 rebase: teach --autosquash to match on sha1 in addition to message
5235 diff: add --detect-copies-harder as a synonym for --find-copies-harder
5238 gitk: Show notes by default (like git log does)
5241 completion: make compatible with zsh
5242 completion: fix zsh check under bash with 'set -u'
5245 add support for the SUA layer (interix; windows)
5246 Interix: add configure checks
5249 Improve the mingw getaddrinfo stub to handle more use cases
5251 Martin von Zweigbergk (3):
5252 rebase: support --verify
5253 Use reflog in 'pull --rebase . foo'
5254 completion: add missing configuration variables
5257 Better "Changed but not updated" message in git-status
5258 Replace "remote tracking" with "remote-tracking"
5259 Change remote tracking to remote-tracking in non-trivial places
5260 everyday.txt: change "tracking branch" to "remote-tracking branch"
5261 Change "tracking branch" to "remote-tracking branch"
5262 Change incorrect uses of "remote branch" meaning "remote-tracking"
5263 Change incorrect "remote branch" to "remote tracking branch" in C code
5264 user-manual.txt: explain better the remote(-tracking) branch terms
5265 git-branch.txt: mention --set-upstream as a way to change upstream configuration
5267 Michael J Gruber (4):
5269 test: allow running the tests under "prove"
5270 t800?-blame.sh: retitle uniquely
5271 t1020-subdirectory: test alias expansion in a subdirectory
5274 mingw: add network-wrappers for daemon
5275 mingw: implement syslog
5276 compat: add inet_pton and inet_ntop prototypes
5278 Nguyễn Thái Ngọc Duy (64):
5279 branch -h: show usage even in an invalid repository
5280 checkout-index -h: show usage even in an invalid repository
5281 commit/status -h: show usage even with broken configuration
5282 gc -h: show usage even with broken configuration
5283 ls-files -h: show usage even with corrupt index
5284 merge -h: show usage even with corrupt index
5285 update-index -h: show usage even with corrupt index
5286 add: do not rely on dtype being NULL behavior
5287 get_cwd_relative(): do not misinterpret root path
5288 builtins: print setup info if repo is found
5289 Add t1510 and basic rules that run repo setup
5290 t1510: setup case #0
5291 t1510: setup case #1
5292 t1510: setup case #2
5293 t1510: setup case #3
5294 t1510: setup case #4
5295 t1510: setup case #5
5296 t1510: setup case #6
5297 t1510: setup case #7
5298 t1510: setup case #8
5299 t1510: setup case #9
5300 t1510: setup case #10
5301 t1510: setup case #11
5302 t1510: setup case #12
5303 t1510: setup case #13
5304 t1510: setup case #14
5305 t1510: setup case #15
5306 t1510: setup case #16
5307 t1510: setup case #17
5308 t1510: setup case #18
5309 t1510: setup case #19
5310 t1510: setup case #20
5311 t1510: setup case #21
5312 t1510: setup case #22
5313 t1510: setup case #23
5314 t1510: setup case #24
5315 t1510: setup case #25
5316 t1510: setup case #26
5317 t1510: setup case #27
5318 t1510: setup case #28
5319 t1510: setup case #29
5320 t1510: setup case #30
5321 t1510: setup case #31
5322 cache.h: realign and use (1 << x) form for CE_* constants
5323 dir.c: add free_excludes()
5324 unpack-trees: move all skip-worktree checks back to unpack_trees()
5325 unpack-trees: fix sparse checkout's "unable to match directories"
5326 Revert "excluded_1(): support exclude files in index"
5327 setup: save prefix (original cwd relative to toplevel) in startup_info
5328 Make prefix_path() return char* without const
5329 get_sha1: support relative path ":path" syntax
5330 get_sha1_oneline: make callers prepare the commit list to traverse
5331 get_sha1: support $commit^{/regex} syntax
5332 get_sha1: handle special case $commit^{/}
5333 Add git_config_early()
5334 Use git_config_early() instead of git_config() during repo setup
5335 setup: limit get_git_work_tree()'s to explicit setup case only
5336 setup: clean up setup_bare_git_dir()
5337 setup: clean up setup_discovered_git_dir()
5338 setup: rework setup_explicit_git_dir()
5339 Remove all logic from get_git_work_tree()
5340 Revert "Documentation: always respect core.worktree if set"
5341 git.txt: correct where --work-tree path is relative to
5342 setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
5345 Minor indentation fix.
5346 Remove @smtp_host_parts variable as not used.
5347 New send-email option smtpserveroption.
5350 commit: helper methods to reduce redundant blocks of code
5351 pretty.c: teach format_commit_message() to reencode the output
5352 commit: --fixup option for use with rebase --autosquash
5353 add tests of commit --fixup
5354 commit: --squash option for use with rebase --autosquash
5355 add tests of commit --squash
5358 MinGW: fix stat() and lstat() implementations for handling symlinks
5359 MinGW: Report errors when failing to launch the html browser.
5360 Skip t1300.70 and 71 on msysGit.
5361 Do not strip CR when grepping HTTP headers.
5362 Skip 'git archive --remote' test on msysGit
5363 git-am: fix detection of absolute paths for windows
5364 git-gui: show command-line errors in a messagebox on Windows
5365 git-gui: enable the Tk console when tracing/debugging on Windows
5366 git-gui: generic version trimming
5367 git-gui: use full dialog width for old name when renaming branch
5368 git-gui: correct assignment of work-tree
5369 git-gui: use wordprocessor tab style to ensure tabs work as expected
5370 git-gui: apply color information from git diff output
5373 gitk: Update Swedish translation (290t)
5375 Peter van der Does (1):
5376 bash: get --pretty=m<tab> completion to work with bash v4
5379 Add global and system-wide gitattributes
5382 commit.c: Remove backward goto in read_craft_line()
5384 Ramkumar Ramachandra (10):
5385 shell: Rewrite documentation and improve error message
5386 t4014-format-patch: Call test_tick before committing
5387 format-patch: Don't go over merge commits
5388 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
5389 merge: Make '--log' an integer option for number of shortlog entries
5390 merge: Make 'merge.log' an integer or boolean option
5391 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
5392 t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
5393 Porcelain scripts: Rewrite cryptic "needs update" error message
5394 t9010 (svn-fe): Eliminate dependency on svn perl bindings
5396 Ramsay Allan Jones (10):
5397 msvc: Fix compilation errors in compat/win32/sys/poll.c
5398 msvc: git-daemon.exe: Fix linker "unresolved externals" error
5399 msvc: Fix build by adding missing INTMAX_MAX define
5400 msvc: Fix macro redefinition warnings
5401 t3600-rm.sh: Don't pass a non-existent prereq to test #15
5402 t9142: Move call to start_httpd into the setup test
5403 lib-git-svn.sh: Avoid setting web server variables unnecessarily
5404 lib-git-svn.sh: Add check for mis-configured web server variables
5405 t9501-*.sh: Fix a test failure on Cygwin
5406 difftool: Fix failure on Cygwin
5409 add description parameter to OPT__VERBOSE
5410 add description parameter to OPT__DRY_RUN
5411 add description parameter to OPT__QUIET
5413 archive: improve --verbose description
5414 branch: improve --verbose description
5415 verify-tag: document --verbose
5418 bisect: improve error message of 'bisect log' while not bisecting
5419 bisect: improve error msg of 'bisect reset' when original HEAD is deleted
5420 bisect: check for mandatory argument of 'bisect replay'
5421 bash: offer refs for 'git bisect start'
5422 bash: not all 'git bisect' subcommands make sense when not bisecting
5423 bash: support more 'git notes' subcommands and their options
5424 bash: support pretty format aliases
5427 parse-remote: handle detached HEAD
5430 t3030: Add a testcase for resolvable rename/add conflict with symlinks
5432 Sebastian Schuberth (3):
5433 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
5434 MinGW: Add missing file mode bit defines
5435 On Windows, avoid git-gui to call Cygwin's nice utility
5437 Shawn O. Pearce (2):
5438 Use git_open_noatime when accessing pack data
5439 Work around EMFILE when there are too many pack files
5442 gitk: Prevent the text pane from becoming editable
5443 gitk: Make text selectable on Mac
5446 send-email: Use To: headers in patch files
5447 send-email: Don't leak To: headers between patches
5448 parse-options: Don't call parse_options_check() so much
5449 parse-options: do not infer PARSE_OPT_NOARG from option type
5452 git-svn: allow the mergeinfo property to be set
5455 contrib/ciabot: git-describe commit instead of HEAD
5458 t5523-push-upstream: add function to ensure fresh upstream repo
5459 t5523-push-upstream: test progress messages
5460 format-patch: page output with --stdout
5461 bash completion: add basic support for git-reflog
5464 commit: Add commit_list prefix in two function names.
5465 builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
5466 builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
5469 {cvs,svn}import: use the new 'git read-tree --empty'
5470 t0003: properly quote $HOME
5471 gitk: Add the equivalent of diff --color-words
5473 Torsten Bögershausen (1):
5474 t9143: do not fail when unhandled.log.gz is not created
5477 diff: use "find" instead of "detect" as prefix for long forms of -M and -C
5479 Ævar Arnfjörð Bjarmason (22):
5480 send-email: use catfile() to concatenate files
5481 send-email: use lexical filehandle for opendir
5482 send-email: use lexical filehandles for $compose
5483 send-email: use lexical filehandles during sending
5484 send-email: get_patch_subject doesn't need a prototype
5485 send-email: file_declares_8bit_cte doesn't need a prototype
5486 send-email: unique_email_list doesn't need a prototype
5487 send-email: cleanup_compose_files doesn't need a prototype
5488 send-email: use \E***\Q instead of \*\*\*
5489 send-email: sanitize_address use $foo, not "$foo"
5490 send-email: sanitize_address use qq["foo"], not "\"foo\""
5491 send-email: use (?:) instead of () if no match variables are needed
5492 send-email: send_message die on $!, not $?
5493 send-email: make_message_id use "require" instead of "use"
5494 send-email: use Perl idioms in while loop
5495 send-email: is_rfc2047_quoted use qr// regexes
5496 send-email: extract_valid_address use qr// regexes
5497 Makefile & configure: add a NO_FNMATCH flag
5498 Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
5499 test-lib: make test_expect_code a test command
5500 t7004-tag.sh: re-arrange git tag comment for clarity
5501 tests: use test_cmp instead of piping to diff(1)
5504 CodingGuidelines: Add a section on writing documentation
5505 diff,difftool: Don't use the {0,2} notation in usage strings
5508 Version v1.7.3.5; changes since v1.7.3.4:
5509 -----------------------------------------
5512 test-lib.sh/test_decode_color(): use octal not hex in awk script
5515 gitweb: Include links to feeds in HTML header only for '200 OK' response
5518 ident: die on bogus date format
5521 Fix typo in git-gc document.
5523 Jonathan Nieder (2):
5524 t0050: fix printf format strings for portability
5525 gitweb: skip logo in atom feed when there is none
5528 commit: die before asking to edit the log message
5529 am --abort: keep unrelated commits since the last failure and warn
5530 rebase --skip: correctly wrap-up when skipping the last patch
5535 status: Quote paths with spaces in short format
5538 t/t8006: Demonstrate blame is broken when cachetextconv is on
5539 fill_textconv(): Don't get/put cache if sha1 is not valid
5542 fsck docs: remove outdated and useless diagnostic
5544 Michael J Gruber (2):
5545 git-difftool.txt: correct the description of $BASE and describe $MERGED
5546 difftool: provide basename to external tools
5548 Ramsay Allan Jones (1):
5549 t3419-*.sh: Fix arithmetic expansion syntax error
5552 close file on error in read_mmfile()
5554 Robin H. Johnson (2):
5555 Fix false positives in t3404 due to SHELL=/bin/false
5556 t9001: Fix test prerequisites
5559 userdiff: fix typo in ruby and python word regexes
5561 Vasyl' Vavrychuk (1):
5562 trace.c: mark file-local function static
5565 Version v1.7.3.4; changes since v1.7.3.3:
5566 -----------------------------------------
5569 contrib/hooks/post-receive-email: fix return values from prep_for_email
5571 Alejandro R. Sedeño (1):
5572 Add --force to git-send-email documentation
5575 apply: Recognize epoch timestamps with : in the timezone
5577 Christoph Mallon (1):
5578 diff --check: correct line numbers of new blank lines at EOF
5580 Clemens Buchacher (6):
5581 t7607: use test-lib functions and check MERGE_HEAD
5582 t7607: add leading-path tests
5583 add function check_ok_to_remove()
5584 lstat_cache: optionally return match_len
5585 do not overwrite files in leading path
5586 use persistent memory for rejected paths
5588 Federico Cuello (1):
5589 Fix git-apply with -p greater than 1
5592 t5550: test HTTP authentication and userinfo decoding
5593 Fix username and password extraction from HTTP URLs
5596 gitweb: Introduce esc_attr to escape attributes of HTML elements
5599 git-pull.txt: Mention branch.autosetuprebase
5602 log.decorate: accept 0/1 bool values
5603 reflogs: clear flags properly in corner case
5605 Jonathan "Duke" Leto (1):
5606 Correct help blurb in checkout -p and friends
5608 Jonathan Nieder (4):
5609 apply: handle patches with funny filename and colon in timezone
5610 cherry-pick/revert: transparently refresh index
5611 Documentation: split gitignore page into sections
5612 Documentation: point to related commands from gitignore
5615 test: git-apply -p2 rename/chmod only
5616 Do not link with -lcrypto under NO_OPENSSL
5622 setup: make sure git_dir path is in a permanent buffer, getenv(3) case
5624 Martin von Zweigbergk (2):
5625 rebase --abort: do not update branch ref
5626 rebase: only show stat if configured to true
5628 Michael J Gruber (6):
5629 t/t7004-tag: test handling of rfc1991 signatures
5630 verify-tag: factor out signature detection
5631 tag: factor out sig detection for body edits
5632 tag: factor out sig detection for tag display
5633 tag: recognize rfc1991 signatures
5634 git-rm.txt: Fix quoting
5636 Nguyễn Thái Ngọc Duy (1):
5637 entry.c: remove "checkout-index" from error messages
5640 diff: don't presume empty file when corresponding object is missing
5641 make pack-objects a bit more resilient to repo corruption
5644 smart-http: Don't change POST to GET when following redirect
5645 t5550-http-fetch: add missing '&&'
5646 t5550-http-fetch: add test for http-fetch
5647 shift end_url_with_slash() from http.[ch] to url.[ch]
5648 url: add str wrapper for end_url_with_slash()
5649 http-backend: use end_url_with_slash()
5650 http-push: Normalise directory names when pushing to some WebDAV servers
5651 http-push: check path length before using it
5652 http-push: add trailing slash at arg-parse time, instead of later on
5653 http-fetch: rework url handling
5655 Ævar Arnfjörð Bjarmason (2):
5656 perl: bump the required Perl version to 5.8 from 5.6.[21]
5657 perl: use "use warnings" instead of -w
5660 Version v1.7.3.3; changes since v1.7.3.2:
5661 -----------------------------------------
5664 submodule sync: Update "submodule.<name>.url" for empty directories
5667 Fix handling of git-p4 on deleted files
5670 userdiff.c: add builtin fortran regex patterns
5671 builtin/revert.c: don't dereference a NULL pointer
5673 Brian Gernhardt (1):
5674 t/gitweb-lib: Don't pass constant to decode_utf8
5676 Clemens Buchacher (3):
5677 add rebase patch id tests
5678 do not search functions for patch ID
5679 do not overwrite untracked during merge from unborn branch
5682 git-blame.el: Add (require 'format-spec)
5684 Diego Elio Pettenò (1):
5685 imap-send: link against libcrypto for HMAC and others
5688 mingw: do not set errno to 0 on success
5690 Giuseppe Bilotta (1):
5691 CodingGuidelines: mention whitespace preferences for shell scripts
5694 repack: add -F flag to let user choose between --no-reuse-delta/object
5695 Documentation: pack.compression: explain how to recompress
5698 git-commit.txt: (synopsis): move -i and -o before "--"
5701 diff: don't use pathname-based diff drivers for symlinks
5702 rev-list: handle %x00 NUL in user format
5703 docs: give more hints about how "add -e" works
5704 apply: don't segfault on binary files with missing data
5705 docs: give more hints about how "add -e" works
5706 document sigchain api
5709 pull: Remove --tags option from manpage
5712 mailmap: fix use of freed memory
5715 git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
5717 Jonathan Nieder (5):
5718 t4203 (mailmap): stop hardcoding commit ids and dates
5719 send-pack: avoid redundant "pack-objects died with strange error"
5720 Documentation: document show -s
5721 add: introduce add.ignoreerrors synonym for add.ignore-errors
5722 Documentation: do not misinterpret pull refspec as bold text
5725 t4203: do not let "git shortlog" DWIM based on tty
5726 t3402: test "rebase -s<strategy> -X<opt>"
5727 Documentation: Fix mark-up of lines with more than one tilde
5732 test-lib: extend test_decode_color to handle more color codes
5733 diff: handle lines containing only whitespace and tabs better
5735 Kevin P. Fleming (1):
5736 post-receive-email: ensure sent messages are not empty
5739 blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
5740 blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
5741 blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
5743 Martin von Zweigbergk (2):
5744 rebase -X: do not clobber strategy
5745 Documentation/git-pull: clarify configuration
5747 Michael J Gruber (6):
5748 git-reset.txt: clarify branch vs. branch head
5749 git-reset.txt: reset does not change files in target
5750 git-reset.txt: reset --soft is not a no-op
5751 git-reset.txt: use "working tree" consistently
5752 git-reset.txt: point to git-checkout
5753 git-reset.txt: make modes description more consistent
5755 Nathan W. Panike (1):
5756 Fix a formatting error in git-merge.txt
5758 Nguyễn Thái Ngọc Duy (3):
5759 dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
5760 clean: avoid quoting twice
5761 clean: remove redundant variable baselen
5764 diff: avoid repeated scanning while looking for funcname
5767 send-email: Refuse to send cover-letter template subject
5768 prefix_filename(): safely handle the case where pfx_len=0
5769 merge-file: correctly find files when called in subdir
5770 repack: place temporary packs under .git/objects/pack/
5772 Uwe Kleine-König (1):
5773 get_author_ident_from_commit(): remove useless quoting
5776 Fix copy-pasted comments related to tree diff handling.
5777 Keep together options controlling the behaviour of diffcore-rename.
5778 Document that rev-list --graph triggers parent rewriting.
5781 bash: Match lightweight tags in prompt
5783 Ævar Arnfjörð Bjarmason (1):
5784 Makefile: add CC to TRACK_CFLAGS
5787 Version v1.7.3.2; changes since v1.7.3.1:
5788 -----------------------------------------
5790 Andreas Gruenbacher (1):
5791 Clarify and extend the "git diff" format documentation
5794 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
5797 Documentation: update-index: -z applies also to --index-info
5800 diffcore-pickaxe.c: remove unnecessary curly braces
5803 documentation: git-config minor cleanups
5806 t3020 (ls-files-error-unmatch): remove stray '1' from end of file
5809 Documentation/git-svn: discourage "noMetadata"
5812 do not depend on signed integer overflow
5814 Johannes Schindelin (2):
5815 Make sure that git_getpass() never returns NULL
5816 Fix typo in pack-objects' usage
5819 stash: simplify parsing fixes
5821 Jonathan Nieder (10):
5822 t0004 (unwritable files): simplify error handling
5823 environment.c: remove unused variable
5824 setup: make sure git dir path is in a permanent buffer
5825 init: plug tiny one-time memory leak
5826 xdiff: cast arguments for ctype functions to unsigned char
5827 Documentation: No argument of ALLOC_GROW should have side-effects
5828 Documentation: gitrevisions is in section 7
5829 Documentation: diff can compare blobs
5830 Documentation: expand 'git diff' SEE ALSO section
5831 Documentation: update implicit "--no-index" behavior in "git diff"
5834 MinGW: avoid collisions between "tags" and "TAGS"
5835 CodingGuidelines: reword parameter expansion section
5836 shell portability: no "export VAR=VAL"
5840 Update test script annotate-tests.sh to handle missing/extra authors
5843 user-manual: be consistent in illustrations to 'git rebase'
5845 Mathias Lafeldt (1):
5846 git-svn: fix processing of decorated commit hashes
5849 diff: trivial fix for --output file error message
5851 Michael J Gruber (4):
5852 remote-helpers: build in platform independent directory
5853 user-manual: fix anchor name Finding-comments-With-given-Content
5854 rev-list-options: clarify --parents and --children
5855 git-show-ref.txt: clarify the pattern matching
5857 Ramkumar Ramachandra (1):
5858 SubmittingPatches: Document some extra tags used in commit messages
5861 work around buggy S_ISxxx(m) implementations
5864 git-svn: check_cherry_pick should exclude commits already in our history
5867 Better advice on using topic branches for kernel development
5869 Uwe Kleine-König (1):
5870 Documentation/git-clone: describe --mirror more verbosely
5873 t/t3415: use && where applicable.
5876 Use angles for placeholders consistently
5877 Fix odd markup in --diff-filter documentation
5878 Use parentheses and `...' where appropriate
5879 Remove stray quotes in --pretty and --format documentation
5880 Put a space between `<' and argument in pack-objects usage string
5881 Fix {update,checkout}-index usage strings
5884 Version v1.7.3.1; changes since v1.7.3:
5885 ---------------------------------------
5888 t/t3903-stash: improve testing of git-stash show
5889 wt-status.c: don't leak directory entries when processing untracked,ignored
5890 git-send-email.perl: ensure $domain is defined before using it
5892 Brian Gernhardt (1):
5893 git-stash: fix flag parsing
5895 Christian Couder (1):
5896 t6050 (replace): fix bogus "fetch branch with replacement" test
5898 Daniel Knittl-Frank (1):
5899 Improvements to `git checkout -h`
5902 prefer test -h over test -L in shell scripts
5905 stash: fix git stash branch regression when branch creation fails
5908 CodingGuidelines: spell Arithmetic Expansion with $(($var))
5912 Fix missing 'does' in man-page for 'git checkout'
5915 update comment and documentation for :/foo syntax
5917 Michael J Gruber (1):
5918 contrib/completion: --no-index option to git diff
5921 strbuf.h: fix comment typo
5922 dir.c: squelch false uninitialized memory warning
5924 Ramsay Allan Jones (1):
5925 t1503: Fix arithmetic expansion syntax error when using dash
5928 stash drops the stash even if creating the branch fails because it already exists
5930 Wesley J. Landaker (1):
5931 Documentation: Refer to git-commit-tree in git-filter-branch help
5934 Version v1.7.3; changes since v1.7.3-rc2:
5935 -----------------------------------------
5938 t/t7300: workaround ancient touch by rearranging arguments
5940 Brian Gernhardt (1):
5941 t7003: Use test_commit instead of custom function
5944 git-rebase--interactive.sh: replace cut with ${v%% *}
5947 git-ls-files.txt: clarify -x/--exclude option
5950 ls-files documentation: reword for consistency
5954 Version v1.7.3-rc2; changes since v1.7.3-rc1:
5955 ---------------------------------------------
5958 bundle: detect if bundle file cannot be created
5959 filter-branch: retire --remap-to-ancestor
5962 Several tests: cd inside subshell instead of around
5963 t1020: Get rid of 'cd "$HERE"' at the start of each test
5965 Jonathan Nieder (5):
5966 tests: subshell indentation stylefix
5967 t1450 (fsck): remove dangling objects
5968 t2105 (gitfile): add missing &&
5969 t1302 (core.repositoryversion): style tweaks
5970 t2016 (checkout -p): add missing &&
5973 t3101: modernise style
5974 ls-tree $di $dir: do not mistakenly recurse into directories
5978 git-gui: use shell to launch textconv filter in "blame"
5981 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
5984 git-gui: Make usage statement visible on Windows.
5985 git-gui: display error launching blame as a message box.
5986 git-gui: handle textconv filter on Windows and in development
5987 git-gui: ensure correct application termination in git-gui--askpass
5988 git-gui: avoid mis-encoding the copyright message on Windows.
5992 git-gui: Update Swedish translation (521t).
5994 Ramsay Allan Jones (1):
5995 vcs-svn: Fix some printf format compiler warnings
5998 compat/nedmalloc: don't force NDEBUG on the rest of git
6001 RE: [PATCH] Avoid rename/add conflict when contents are identical
6004 Version v1.7.3-rc1; changes since v1.7.3-rc0:
6005 ---------------------------------------------
6008 Add a new option 'core.askpass'.
6011 t/t5510: demonstrate failure to fetch when current branch has merge ref
6012 builtin/fetch.c: ignore merge config when not fetching from branch's remote
6013 t/t7008: workaround broken handling of \000 by printf on IRIX
6014 Makefile: use compat regex on IRIX 6.5
6015 builtin/fetch.c: comment that branch->remote_name is usable when has_merge
6016 t/t5510-fetch.sh: improve testing with explicit URL and merge spec
6017 diff.c: call regfree to free memory allocated by regcomp when necessary
6018 xdiff-interface.c: always trim trailing space from xfuncname matches
6019 t/t4018: test whether the word_regex patterns compile
6020 t/t4018: avoid two unnecessary sub-shell invocations
6023 cache_tree_free: Fix small memory leak
6024 revert: Fix trivial comment style issue
6027 pass "git -c foo=bar" params through environment
6028 tests: make test_must_fail more verbose
6029 tests: make test_must_fail fail on missing commands
6032 t3404 & t7508: cd inside subshell instead of around
6035 notes: Don't create (empty) commit when removing non-existing notes
6038 fast-export: ensure that a renamed file is printed after all references
6040 Jonathan Nieder (3):
6041 do not pass "git -c foo=bar" params to transport helpers
6042 tests: make test_might_fail more verbose
6043 tests: make test_might_fail fail on missing commands
6046 install-webdoc: keep installed RelNotes-*.txt
6047 Prepare for 1.7.3 rc1
6051 Allow core.askpass to override SSH_ASKPASS.
6052 Extend documentation of core.askpass and GIT_ASKPASS.
6055 config.txt: fix placement of diff.noprefix
6058 Documentation: move RelNotes into a directory of their own
6061 builtin.h: Move two functions definitions to help.h.
6062 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
6065 Version v1.7.3-rc0; changes since v1.7.2.5:
6066 -------------------------------------------
6068 Alejandro R. Sedeño (1):
6069 gitweb: move highlight config out of guess_file_syntax()
6072 Add a for_each_string_list_item macro
6073 Convert the users of for_each_string_list to for_each_string_list_item macro
6075 Alexander Gladysh (1):
6076 Add a rename + D/F conflict testcase
6079 gitweb: Don't die_error in git_tag after already printing headers
6082 git-rebase--interactive.sh: rework skip_unnecessary_picks
6083 git-rebase--interactive.sh: use printf instead of echo to print commit message
6085 Brian Gernhardt (2):
6086 t7610: cd inside subshell instead of around
6087 t7606: Avoid using head as a file name
6090 mergetool: Remove explicit references to /dev/tty
6092 Christian Couder (11):
6093 revert: report success when using option --strategy
6094 revert: refactor commit code into a new run_git_commit() function
6095 revert: don't print "Finished one cherry-pick." if commit failed
6096 revert: improve success message by adding abbreviated commit sha1
6097 t3508: add check_head_differs_from() helper function and use it
6098 revert: fix off by one read when searching the end of a commit subject
6099 revert: refactor code to find commit subject in find_commit_subject()
6100 revert: rename variables related to subject in get_message()
6101 bisect: use find_commit_subject() instead of custom code
6102 merge-recursive: use find_commit_subject() instead of custom code
6103 blame: use find_commit_subject() instead of custom code
6105 Clemens Buchacher (1):
6106 hash binary sha1 into patch id
6109 mergetool: Skip autoresolved paths
6112 Add memory pool library
6113 Add string-specific memory pool
6114 Add stream helper library
6115 Infrastructure to write revisions in fast-export format
6118 David D. Kilzer (3):
6119 git svn: fix dcommit to work with touched files
6120 git-svn: fix regex to remove "tail" from svn tags
6121 git-svn: fix fetch with deleted tag
6124 merge-recursive: porcelain messages for checkout
6125 t7609: test merge and checkout error messages
6127 Dmitry Statyvka (1):
6128 git svn: add an option to recode pathnames
6131 Add additional testcases for D/F conflicts
6132 merge-recursive: Fix D/F conflicts
6133 merge_recursive: Fix renames across paths below D/F conflicts
6134 fast-export: Fix output order of D/F changes
6135 fast-import: Improve robustness when D->F changes provided in wrong order
6136 fast-export: Fix dropping of files with --import-marks and path limiting
6137 fast-export: Add a --full-tree option
6138 upload-pack: Improve error message when bad ref requested
6139 Mark tests that use symlinks as needing SYMLINKS prerequisite
6140 merge-recursive: Fix typo
6141 t6031: Add a testcase covering multiple renames across a D/F conflict
6142 merge-recursive: Fix multiple file rename across D/F conflict
6143 merge-recursive: Avoid excessive output for and reprocessing of renames
6146 instaweb: fix WEBrick server support
6147 instaweb: minimize moving parts for WEBrick
6148 instaweb: add access+error logging for WEBrick
6149 t9155: fix compatibility with older SVN
6151 Eyvind Bernhardsen (3):
6152 Avoid conflicts when merging branches with mixed normalization
6153 Try normalizing files to avoid delete/modify conflicts when merging
6154 Don't expand CRLFs when normalizing text during merge
6157 Change regerror() declaration from K&R style to ANSI C (C89)
6160 split_cmdline: Allow caller to access error string
6163 Teach ref iteration module about submodules
6164 setup_revisions(): Allow walking history in a submodule
6165 Implement automatic fast-forward merge for submodules
6166 add configuration variable for --autosquash option of interactive rebase
6169 gitweb: Fix typo in run() subroutine
6172 Convert "! git" to "test_must_fail git"
6173 Add -e/--exclude to git-clean.
6174 Add test for git clean -e.
6175 builtin/push.c: remove useless temporary variable
6176 Document git-instaweb start/stop/restart
6179 Add treap implementation
6182 docs: fix Makefile dependency for user manual
6185 Submodules: Add the new "ignore" config option for diff and status
6186 Submodules: Use "ignore" settings from .gitmodules too for diff and status
6187 Add tests for the diff.ignoreSubmodules config option
6188 checkout: Add test for diff.ignoreSubmodules
6189 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
6190 t7405: cd inside subshell instead of around
6191 t7406 & t7407: add missing && at end of lines
6194 Make graph_next_line() available in the graph.h API
6195 Enable custom schemes for column colors in the graph API
6197 Johannes Schindelin (2):
6198 Add the 'diff.ignoreSubmodules' config setting
6199 checkout: respect diff.ignoreSubmodules setting
6202 Fix compat/regex ANSIfication on MinGW
6205 detached-stash: introduce parse_flags_and_revs function
6206 detached-stash: work around git rev-parse failure to detect bad log refs
6207 detached-stash: simplify stash_apply
6208 detached-stash: simplify stash_drop
6209 detached-stash: refactor git stash pop implementation
6210 detached-stash: simplify git stash branch
6211 detached-stash: simplify git stash show
6212 detached-stash: tests of git stash with stash-like arguments
6213 detached-stash: update Documentation
6214 rev-parse: exit with non-zero status if ref@{n} is not valid.
6215 sha1_name.c: use warning in preference to fprintf(stderr
6216 rev-parse: tests git rev-parse --verify master@{n}, for various n
6217 t1503: fix broken test_must_fail calls
6218 t3903: fix broken test_must_fail calls
6220 Jonathan Nieder (89):
6221 Teach fast-import to import subtrees named by tree id
6222 Export parse_date_basic() to convert a date string to timestamp
6223 t1501 (rev-parse): clarify
6224 tests: try git apply from subdir of toplevel
6225 setup: split off $GIT_DIR-set case from setup_git_directory_gently
6226 setup: split off a function to checks working dir for .git file
6227 setup: split off code to handle stumbling upon a repository
6228 setup: split off a function to handle hitting ceiling in repo search
6229 setup: split off get_device_or_die helper
6230 t1011 (sparse checkout): style nitpicks
6231 gitweb: allow configurations that change with each request
6232 t4111 (apply): refresh index before applying patches to it
6233 diff: split off a function for --stat-* option parsing
6234 t6038 (merge.renormalize): style nitpicks
6235 t6038 (merge.renormalize): try checkout -m and cherry-pick
6236 t6038 (merge.renormalize): check that it can be turned off
6237 merge-trees: push choice to renormalize away from low level
6238 merge-trees: let caller decide whether to renormalize
6239 Documentation/technical: document ll_merge
6240 ll-merge: make flag easier to populate
6241 ll-merge: let caller decide whether to renormalize
6242 t4200 (rerere): modernize style
6243 rerere: migrate to parse-options API
6244 rerere: never renormalize
6245 merge-recursive --renormalize
6246 Introduce vcs-svn lib
6247 Update svn-fe manual
6248 svn-fe manual: Clarify warning about deltas in dump files
6249 vcs-svn: remove build artifacts on "make clean"
6251 compat: add strtok_r()
6252 vcs-svn: Rename dirent pool to build on Windows
6253 vcs-svn: Avoid %z in format string
6254 t9010 (svn-fe): use Unix-style path in URI
6255 t9010 (svn-fe): avoid symlinks in test
6256 Eliminate “Finished cherry-pick/revert” message
6257 Introduce advise() to print hints
6258 cherry-pick/revert: Use error() for failure message
6259 cherry-pick/revert: Use advise() for hints
6260 t7606 (merge-theirs): modernize style
6261 merge: let custom strategies intervene in trivial merges
6262 t7006 (pager): add missing TTY prerequisites
6263 merge: do not mistake (ancestor of) tag for branch
6264 t7600 (merge): modernize style
6265 t7600 (merge): do not launch gitk for --debug
6266 t7600 (merge): check reflog entry
6267 t7600 (merge): test merge from branch yet to be born
6268 t6010 (merge-base): modernize style
6269 t6200 (fmt-merge-msg): style nitpicks
6270 Documentation: add a SEE ALSO section for merge-base
6271 merge-base --octopus to mimic show-branch --merge-base
6272 merge-base --independent to print reduced parent list in a merge
6273 fmt-merge-msg -m to override merge title
6274 merge script: --squash, --ff from unborn branch are errors
6275 merge script: tweak unmerged files message to match builtin
6276 merge script: refuse to merge during merge
6277 merge script: improve log message subject
6278 merge script: merge -X<option>
6279 merge script: allow custom strategies
6280 merge script: forbid merge -s index
6281 merge script: handle -m --log correctly
6282 merge script: handle many-way octopus
6283 merge script: --ff-only to disallow true merge
6284 merge script: handle --no-ff --no-commit correctly
6285 merge script: notice @{-1} shorthand
6286 merge script: learn --[no-]rerere-autoupdate
6287 autoconf: don't use platform regex if it lacks REG_STARTEND
6288 Documentation: set a !DOCTYPE for user manual
6289 Documentation: tweak description of log.date
6290 Documentation: quoting trouble in "git rm" discussion
6291 Documentation: unbreak regex in show-ref manual
6292 Documentation: clarify quoting in "git add" example
6293 Documentation: add missing quotes to "git grep" examples
6294 Documentation: clarify quoting in "git rm" example
6295 Documentation: clarify quoting in gitignore docs
6296 Documentation: remove backslashes in manpage synopses
6297 Documentation/technical: avoid stray backslash in parse-options API docs
6298 Documentation: remove stray backslash from "git bundle" manual
6299 Documentation: remove backslash before ~ in fast-import manual
6300 Documentation: remove stray backslashes in rev-parse manual
6301 Documentation: avoid stray backslashes in core tutorial
6302 Documentation: avoid stray backslash in user manual
6303 Documentation: do not convert ... operator to ellipses
6304 Documentation: remove stray backslashes from "Fighting regressions" article
6305 Documentation: remove stray backslash in show-branch discussion
6306 apply: split quoted filename handling into new function
6307 tests: exercise "git apply" with weird filenames
6308 apply: handle traditional patches with space in filename
6309 tests: simplify "missing PREREQ" message
6312 cvs tests: do not touch test CVS repositories shipped with source
6313 compat/regex: get rid of old-style definition
6314 autoconf: regex library detection typofix
6315 Work around em-dash handling in newer AsciiDoc
6316 install-webdoc: filter timestamp-only changes correctly
6319 Kevin P. Fleming (1):
6320 post-receive-email: optional message line count limit
6323 diff: parse separate options like -S foo
6324 diff: parse separate options --stat-width n, --stat-name-width n
6325 log: parse separate options like git log --grep foo
6326 log: parse separate option for --glob
6327 rebase -i: add exec command to launch a shell command
6328 test-lib: user-friendly alternatives to test [-d|-f|-e]
6329 Turn unpack_trees_options.msgs into an array + enum
6330 merge-recursive: distinguish "removed" and "overwritten" messages
6331 unpack_trees: group error messages by type
6332 tests: factor HOME=$(pwd) in test-lib.sh
6333 Move set_porcelain_error_msgs to unpack-trees.c and rename it
6334 setup_unpack_trees_porcelain: take the whole options struct as parameter
6335 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
6336 t7609-merge-co-error-msgs: test non-fast forward case too.
6338 Michael J Gruber (3):
6339 git-bundle.txt: Cleanup
6340 git-bundle.txt: whitespace cleanup
6341 git-bundle.txt: Clarify rev-list-args restrictions
6344 rebase: support -X to pass through strategy options
6346 Nguyễn Thái Ngọc Duy (22):
6347 upload-pack: remove unused "create_full_pack" code in do_rev_list
6348 setup: do not forget working dir from subdir of gitdir
6349 Revert "rehabilitate 'git index-pack' inside the object store"
6350 setup: split off a function to handle ordinary .git directories
6351 unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
6352 unpack-trees: let read-tree -u remove index entries outside sparse area
6353 unpack-trees: do not check for conflict entries too early
6354 unpack-trees: mark new entries skip-worktree appropriately
6355 git wrapper: introduce startup_info struct
6356 setup: remember whether repository was found
6357 git wrapper: allow setup_git_directory_gently() be called earlier
6358 shortlog: run setup_git_directory_gently() sooner
6359 grep: run setup_git_directory_gently() sooner
6360 apply: run setup_git_directory_gently() sooner
6361 bundle: run setup_git_directory_gently() sooner
6362 config: run setup_git_directory_gently() sooner
6363 index-pack: run setup_git_directory_gently() sooner
6364 ls-remote: run setup_git_directory_gently() sooner
6365 var: run setup_git_directory_gently() sooner
6366 merge-file: run setup_git_directory_gently() sooner
6367 clone: warn users --depth is ignored in local clones
6368 parse_object: pass on the original sha1, not the replaced one
6371 Userdiff patterns for C#
6373 Ralf Wildenhues (1):
6374 Typos in code comments, an error message, documentation
6376 Ramkumar Ramachandra (1):
6377 builtin/checkout: Fix message when switching to an existing branch
6379 Spencer E. Olson (1):
6380 Allow HTTP user agent string to be modified.
6383 git svn: URL-decode left-hand side of svn refspec
6385 Sverre Rabbelier (1):
6386 config: add --local option
6389 add tests for checkout -b
6390 builtin/checkout: reword hint for -b
6391 builtin/checkout: learn -B
6392 builtin/checkout: handle -B from detached HEAD correctly
6395 string_list: Add STRING_LIST_INIT macro and make use of it.
6396 object.h: Add OBJECT_ARRAY_INIT macro and make use of it.
6399 Do not unquote + into ' ' in URLs
6400 ls-files: learn a debugging dump format
6401 Makefile: make gcov invocation configurable
6402 test: Introduce $GIT_BUILD_DIR
6404 Ævar Arnfjörð Bjarmason (59):
6405 sha1_file: Show the the type and path to corrupt objects
6406 tests: Ignore the Test::Harness .prove file
6407 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
6408 SubmittingPatches: Clarify the Signed-off-by rules
6409 SubmittingPatches: Cite the 50 char subject limit
6410 perl/Makefile: Unset INSTALL_BASE when making perl.mak
6411 test-lib: Don't write test-results when HARNESS_ACTIVE
6412 test-lib: Add support for multiple test prerequisites
6413 test-lib: Print missing prerequisites in test output
6414 t/README: Document the predefined test prerequisites
6415 tests: A SANITY test prereq for testing if we're root
6416 test-lib: Multi-prereq support only checked the last prereq
6417 tests: Infrastructure for Git smoke testing
6418 t/README: Document the Smoke testing
6419 t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
6420 t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
6421 gitignore: Ignore files generated by "make coverage"
6422 Makefile: Include subdirectories in "make cover" reports
6423 Makefile: Split out the untested functions target
6424 Makefile: Add cover_db target
6425 Makefile: Add cover_db_html target
6426 t/README: A new section about test coverage
6427 t/README: Add a note about the dangers of coverage chasing
6428 tests: implicitly skip SYMLINKS tests using <prereq>
6429 t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
6430 t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
6431 t/t7800-difftool.sh: Skip with prereq on no PERL
6432 t/README: Update "Skipping tests" to align with best practices
6433 t/t1304-default-acl: change from skip_all=* to prereq skip
6434 t/t5705-clone-2gb: change from skip_all=* to prereq skip
6435 t/t7005-editor: change from skip_all=* to prereq skip
6436 t/t5503-tagfollow: change from skip_all=* to prereq skip
6437 t/t4016-diff-quote: change from skip_all=* to prereq skip
6438 t/t3902-quoted: change from skip_all=* to prereq skip
6439 t/t3300-funny-names: change from skip_all=* to prereq skip
6440 git-notes: Run partial expensive test everywhere
6441 t/Makefile: Create test-results dir for smoke target
6442 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
6443 t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
6444 lib-patch-mode tests: change from skip_all=* to prereq skip
6445 t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
6446 t/t9001-send-email.sh: Remove needless PROG=* assignment
6447 t/t9001-send-email.sh: change from skip_all=* to prereq skip
6448 t/t9001-send-email.sh: convert setup code to tests
6449 t/t7105-reset-patch.sh: Add a PERL prerequisite
6450 t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
6451 t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
6452 tests: fix syntax error in "Use advise() for hints" test
6453 compat/regex: use the regex engine from gawk for compat
6454 compat/regex: get the gawk regex engine to compile within git
6455 compat/regex: define out variables only used under RE_ENABLE_I18N
6456 t/t9010-svn-fe.sh: add an +x bit to this test
6457 t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
6458 reset: suggest what to do upon "git reset --mixed <paths>"
6459 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
6460 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
6461 test-lib: Allow overriding of TEST_DIRECTORY
6462 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
6463 test-lib: use subshell instead of cd $new && .. && cd $old
6466 Version v1.7.2.5; changes since v1.7.2.4:
6467 -----------------------------------------
6470 gitweb: Introduce esc_attr to escape attributes of HTML elements
6476 Version v1.7.2.4; changes since v1.7.2.3:
6477 -----------------------------------------
6480 diff.c: call regfree to free memory allocated by regcomp when necessary
6481 xdiff-interface.c: always trim trailing space from xfuncname matches
6484 cache_tree_free: Fix small memory leak
6485 revert: Fix trivial comment style issue
6488 Fix whitespace issue in object.c
6491 git-commit.txt: (synopsis): move -i and -o before "--"
6494 t5505: add missing &&
6496 Jonathan Nieder (1):
6497 add: introduce add.ignoreerrors synonym for add.ignore-errors
6500 tag.c: whitespace breakages fix
6501 t3101: modernise style
6505 config.txt: fix placement of diff.noprefix
6508 compat/nedmalloc: don't force NDEBUG on the rest of git
6511 bash: Match lightweight tags in prompt
6514 Version v1.7.2.3; changes since v1.7.2.2:
6515 -----------------------------------------
6518 Makefile: link builtins residing in bin directory to main git binary too
6519 Makefile: make hard/symbolic links for non-builtins too
6522 fetch: allow command line --tags to override config
6525 submodule sync: Update "submodule.<name>.url"
6528 t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
6529 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
6530 tree-walk: Correct bitrotted comment about tree_entry()
6533 pack-refs: remove newly empty directories
6536 for-each-ref: fix objectname:short bug
6539 t7403: add missing &&'s
6541 Jonathan Nieder (12):
6542 t4150 (am): style fix
6543 t4150 (am): futureproof against failing tests
6544 t3400 (rebase): whitespace cleanup
6545 archive: abbreviate substituted commit ids again
6546 checkout, commit: remove confusing assignments to rev.abbrev
6547 examples/commit: use --abbrev for commit summary
6548 Documentation: flesh out “git pull” description
6549 core: Stop leaking ondisk_cache_entrys
6550 read-tree: stop leaking tree objects
6551 write-tree: Avoid leak when index refers to an invalid object
6552 t3302 (notes): Port to Solaris
6553 parse-options: clarify PARSE_OPT_NOARG description
6556 Teach "apply --index-info" to handle rename patches
6557 rebase: protect against diff.renames configuration
6558 diff --follow: do not waste cycles while recursing
6559 diff --follow: do call diffcore_std() as necessary
6564 Fix 'git log' early pager startup error case
6567 Tell ignore file about generate files in /gitweb/static
6570 xmalloc: include size in the failure message
6571 t0003: add missing && at end of lines
6574 fix >4GiB source delta assertion failure
6576 Ralf Wildenhues (1):
6577 Typos in code comments, an error message, documentation
6580 mingw_utime(): handle NULL times parameter
6581 rerere: fix overeager gc
6584 builtin/merge_recursive.c: Add an usage string and make use of it.
6587 Documentation/git-reset: reorder modes for soft-mixed-hard progression
6588 Documentation/reset: separate options by mode
6589 Documentation/reset: promote 'examples' one section up
6590 Documentation/reset: reorder examples to match description
6591 Documentation/reset: move "undo permanently" example behind "make topic"
6594 Documentation: spelling fixes
6596 Ævar Arnfjörð Bjarmason (1):
6597 log: test for regression introduced in v1.7.2-rc0~103^2~2
6600 Version v1.7.2.2; changes since v1.7.2.1:
6601 -----------------------------------------
6604 Documentation: cite git-am from git-apply
6607 t/t7003: replace \t with literal tab in sed expression
6609 Clément Poulain (1):
6610 git-gui: use textconv filter for diff and blame
6612 David D. Kilzer (1):
6613 Fix git rebase --continue to work with touched files
6616 git-gui: check whether systems nice command works or disable it
6617 git-gui: fix usage of themed widgets variable
6618 git-gui: fix usage of _gitworktree when creating shortcut for windows
6619 git-gui: fix PATH environment for mingw development environment
6620 git-gui: fix shortcut creation on cygwin
6623 diff: strip extra "/" when stripping prefix
6625 Jonathan Nieder (7):
6626 check-ref-format: handle subcommands in separate functions
6627 Allow "check-ref-format --branch" from subdirectory
6628 Makefile: add missing dependencies on url.h
6629 Makefile: add missing dependency on http.h
6630 Documentation: add a FILES section for show-ref
6631 gitweb: clarify search results page when no matching commit found
6632 Standardize do { ... } while (0) style
6635 Fix DIFF_QUEUE_CLEAR refactoring
6636 Documentation: reporting bugs
6637 sha1_name.c: fix parsing of ":/token" syntax
6640 Markus Heidelberg (1):
6641 git-gui: fix "Explore Working Copy" for Windows again
6644 Document ls-files -t as semi-obsolete.
6645 pretty-options.txt: match --format's documentation with implementation.
6646 Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
6647 post-receive-email: remove spurious commas in email subject
6648 push: mention "git pull" in error message for non-fast forwards
6650 Michael J Gruber (1):
6651 Documentation/git-log: Clarify --full-diff
6654 index-pack: Don't follow replace refs.
6657 git-gui: Handle failure of core.worktree to identify the working directory.
6658 git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
6659 git-gui: mc cannot be used before msgcat has been loaded
6660 git-gui: fix size and position of window panes on startup
6662 Raja R Harinath (1):
6663 fast-import: export correctly marks larger than 2^20-1
6665 Ramkumar Ramachandra (2):
6666 contrib/svn-fe: Fix IncludePath
6667 contrib/svn-fe: Add the svn-fe target to .gitignore
6670 notes: allow --dry-run for -n and --verbose for -v
6671 prune: allow --dry-run for -n and --verbose for -v
6673 Shawn O. Pearce (1):
6674 smart-http: Don't deadlock on server failure
6677 xsize_t: check whether we lose bits
6678 Documentation/rev-parse: quoting is required with --parseopt
6679 t7003: fix subdirectory-filter test
6682 git-rebase: fix typo when parsing --force-rebase
6684 Ævar Arnfjörð Bjarmason (4):
6685 test-lib: Ignore --quiet under a TAP harness
6686 test-lib: Remove 3 year old no-op --no-python option
6687 imap-send: Fix sprintf usage
6688 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
6691 Version v1.7.2.1; changes since v1.7.2:
6692 ---------------------------------------
6695 git-rebase--interactive.sh: use printf instead of echo to print commit message
6698 git-instaweb: Fix custom apache log placement
6699 git-instaweb: Fix Apache environment variable passing
6700 git-instaweb: Don't assume Apache executable is named apache2
6703 Check size of path buffer before writing into it
6706 t3700-add: fix dependence on stdout and stderr buffering
6709 INSTALL: configure /etc/xml/catalog to build docs on Cygwin
6711 Jonathan Nieder (1):
6712 config --get --path: check for unset $HOME
6720 Clarify help message when no remote is specified in fetch/pull.
6722 Nathan W. Panike (1):
6723 Add a google-chrome option for web--browse
6725 Nguyễn Thái Ngọc Duy (1):
6726 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout
6729 request-pull.txt: Document -p option
6730 commit: remove full stop from usage help for -u
6733 Cast execl*() NULL sentinels to (char *)
6734 Document receive.denyDeleteCurrent
6735 Documentation/git-push: Explain status output in more detail
6736 Fix 'git' wrapper usage string
6737 Makefile: add check-docs exception for gitrevisions
6740 Version v1.7.2; changes since v1.7.2-rc3:
6741 -----------------------------------------
6744 Makefile: remove some unnecessary curly braces
6745 Makefile: work around ksh's failure to handle missing list argument to for loop
6746 t/README: clarify test_must_fail description
6747 t/t3700: convert two uses of negation operator '!' to use test_must_fail
6748 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail
6749 t/: work around one-shot variable assignment with test_must_fail
6752 Documentation: Explain git-mergetool's use of temporary files
6755 Reorganize `git-log' man page to clarify common diff options.
6758 Check size of path buffer before writing into it
6761 MERGE_RR is in .git, not .git/rr-cache
6764 git add: Add the "--ignore-missing" option for the dry run
6765 git submodule add: Require the new --force option to add ignored paths
6767 Jonathan Nieder (9):
6768 t7006 (pager): introduce helper for parameterized tests
6769 t7006: test pager configuration for several git commands
6770 tests: local config file should be honored from subdirs of toplevel
6771 t3000 (ls-files -o): modernize style
6772 git --paginate: paginate external commands again
6773 gitmodules.5: url can be a relative path
6774 Documentation: add submodule.* to the big configuration variable list
6775 Add a sample user for the svndump library
6776 t/README: correct an exception when breaking a && chain in tests
6780 rebase-i: do not get fooled by a log message ending with backslash
6781 do not write out index when status does not have to
6782 diff A...B: give one possible diff when there are more than one merge-base
6783 diff A...B: do not limit the syntax too narrowly
6784 tests: correct "does reflog exist?" tests
6787 Michael J Gruber (3):
6788 Documentation: split off rev doc into include file
6789 Documentation: gitrevisions
6790 Documentation: link to gitrevisions rather than git-rev-parse
6793 grep -O: Do not pass color sequences as filenames to pager
6795 Nguyễn Thái Ngọc Duy (1):
6796 git --paginate: do not commit pager choice too early
6798 Nicolas Sebrecht (1):
6799 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
6801 Pavan Kumar Sunkara (1):
6805 update-server-info: Shorten read_pack_info_file()
6808 git-svn: write memoized data explicitly to avoid Storable bug
6811 Only run aggregate-results over actual counts
6814 add basic tests for merge-tree
6815 merge-tree: fix where two branches share no changes
6817 Ævar Arnfjörð Bjarmason (3):
6818 git submodule: add submodules with git add -f <path>
6819 git submodule add: Remove old docs about implicit -f
6820 git add: Add --ignore-missing to SYNOPSIS
6823 Version v1.7.2-rc3; changes since v1.7.2-rc2:
6824 ---------------------------------------------
6827 diff.c: fix a graph output bug
6829 Fredrik Skolmli (1):
6830 Documentation: Spelling fix in protocol-capabilities.txt
6833 t0005: work around strange $? in ksh when program terminated by a signal
6835 Jonathan Nieder (1):
6836 t9118 (git-svn): prevent early failure from taking down later tests
6839 Fix "read-tree -m A B" priming the cache-tree
6842 Michael J Gruber (3):
6843 t9118: avoid PEG revision identifier in tests
6844 test-lib: simplify GIT_SKIP_TESTS loop
6845 test-lib: TAP compliance for skipping tests on request
6848 format-patch: document the format.to configuration setting
6850 Nicolas Sebrecht (1):
6851 checkout: accord documentation to what git does
6854 git fetch documentation: describe short '-p' synonym to '--prune' option
6856 Raja R Harinath (1):
6857 Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
6859 Ævar Arnfjörð Bjarmason (1):
6860 tests: Use skip_all=* to skip tests
6863 Version v1.7.2-rc2; changes since v1.7.2-rc1:
6864 ---------------------------------------------
6867 t/t9700/test.pl: don't access private object members, use public access methods
6868 t/t0006: specify timezone as EST5 not EST to comply with POSIX
6871 Documentation/git-gc.txt: add reference to githooks
6874 xdiff: optimise for no whitespace difference when ignoring whitespace.
6877 add missing && to submodule-merge testcase
6880 gitweb: Move evaluate_gitweb_config out of run_request
6883 t0006: test timezone parsing
6884 parse_date: fix signedness in timezone calculation
6885 test-date: fix sscanf type conversion
6887 Jonathan Nieder (1):
6888 t/README: document more test helpers
6891 Updates from the list to 1.7.2 Release Notes
6892 t/README: proposed rewording...
6893 backmerge a few more fixes to 1.7.1.X series
6896 Michael J Gruber (1):
6897 rerere.txt: Document forget subcommand
6899 Pierre Habouzit (1):
6900 fix git branch -m in presence of cross devices
6902 Uwe Kleine-König (1):
6903 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
6905 Ævar Arnfjörð Bjarmason (13):
6906 test-lib: Adjust output to be valid TAP format
6907 test-lib: Make the test_external_* functions TAP-aware
6908 test-lib: output a newline before "ok" under a TAP harness
6909 tests: Skip tests in a way that makes sense under TAP
6910 tests: Say "pass" rather than "ok" on empty lines for TAP
6911 t9700: Use Test::More->builder, not $Test::Builder::Test
6912 t/README: The trash is in 't/trash directory.$name'
6913 t/README: Typo: paralell -> parallel
6914 t/README: Document the prereq functions, and 3-arg test_*
6915 t/README: Document test_external*
6916 t/README: Document test_expect_code
6917 t/README: Add a section about skipping tests
6918 t/README: Document the do's and don'ts of tests
6921 Version v1.7.2-rc1; changes since v1.7.2-rc0:
6922 ---------------------------------------------
6925 bash-completion: Fix __git_ps1 to work with "set -u"
6926 bash completion: Support "divergence from upstream" messages in __git_ps1
6929 t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
6930 t/t7811-grep-open.sh: ensure fake "less" is made executable
6931 t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
6932 t/t9001: use egrep when regular expressions are involved
6934 Brian Gernhardt (1):
6935 t4027,4041: Use test -s to test for an empty file
6937 Christian Couder (1):
6938 revert: accept arbitrary rev-list options
6941 notes: check number of parameters to "git notes copy"
6944 git diff: rename test that had a conflicting name
6945 Add optional parameters to the diff option "--ignore-submodules"
6946 git submodule: ignore dirty submodules for summary and status
6947 Add the option "--ignore-submodules" to "git status"
6949 Johannes Schindelin (3):
6950 Unify code paths of threaded greps
6951 grep: Add the option '--open-files-in-pager'
6952 grep -O: allow optional argument specifying the pager (or editor)
6954 Jonathan Nieder (3):
6955 grep: refactor grep_objects loop into its own function
6956 t3508 (cherry-pick): futureproof against unmerged files
6957 revert: do not rebuild argv on heap
6959 Julian Phillips (6):
6960 string_list: Fix argument order for print_string_list
6961 string_list: Fix argument order for for_each_string_list
6962 string_list: Fix argument order for string_list_insert
6963 string_list: Fix argument order for string_list_insert_at_index
6964 string_list: Fix argument order for string_list_lookup
6965 string_list: Fix argument order for string_list_append
6968 url_decode: URL scheme ends with a colon and does not require a slash
6969 Update draft release notes to 1.7.1.1
6971 git.spec.in: Add gitweb subpackage
6974 Michael J Gruber (4):
6975 t6018: add tests for rev-list's --branches and --tags
6976 t6018: make sure all tested symbolic names are different revs
6977 git-rev-parse.txt: Document ":path" specifier
6978 git-rev-parse.txt: Add more examples for caret and colon
6981 commit.h: add 'type' to struct name_decoration
6982 log-tree.c: Use struct name_decoration's type for classifying decoration
6983 log --decorate: Colorize commit decorations
6984 Allow customizable commit decorations colors
6985 Add test for correct coloring of git log --decoration
6987 Ramsay Allan Jones (2):
6988 msvc: Select the "fast" definition of the {get,put}_be32() macros
6989 notes: Initialise variable to appease gcc
6992 rev-list: introduce --count option
6995 Version v1.7.2-rc0; changes since v1.7.1.4:
6996 -------------------------------------------
6999 Allow passing of configuration parameters in the command line
7000 Use strbufs instead of open-coded string manipulation
7003 textconv: make the API public
7004 textconv: support for blame
7005 t/t8006: test textconv support for blame
7008 Add a macro DIFF_QUEUE_CLEAR.
7009 Make diffcore_std only can run once before a diff_flush
7010 Make git log --follow find copies among unmodified files.
7011 Add a prefix output callback to diff output
7012 Output the graph columns at the end of the commit message
7013 diff.c: Output the text graph padding before each diff line
7014 Emit a whole line in one go
7015 graph.c: register a callback for graph output
7016 Make --color-words work well with --graph
7019 t/t5800: skip if python version is older than 2.5
7020 git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
7021 t/t5150: remove space from sed script
7022 t/t7006: ignore return status of shell's unset builtin
7023 t/aggregate-results: accomodate systems with small max argument list length
7024 Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
7025 Remove python 2.5'isms
7027 Brian Gernhardt (1):
7028 Makefile: Simplify handling of python scripts
7031 whitespace: add tab-in-indent error class
7032 whitespace: tests for git-diff --check with tab-in-indent error class
7033 whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
7034 whitespace: add tab-in-indent support for --whitespace=fix
7035 whitespace: tests for git-apply --whitespace=fix with tab-in-indent
7037 Christian Couder (13):
7038 revert: use strbuf to refactor the code that writes the merge message
7039 revert: refactor merge recursive code into its own function
7040 merge: refactor code that calls "git merge-STRATEGY"
7041 merge: make function try_merge_command non static
7042 revert: add "--strategy" option to choose merge strategy
7043 revert: cleanup code for -x option
7044 revert: use run_command_v_opt() instead of execv_git_cmd()
7045 revert: refactor code into a do_pick_commit() function
7046 revert: change help_msg() to take no argument
7047 revert: allow cherry-picking more than one commit
7048 revert: add tests to check cherry-picking many commits
7049 Documentation/cherry-pick: describe passing more than one commit
7050 Documentation/revert: describe passing more than one commit
7052 Clément Poulain (3):
7053 sha1_name: add get_sha1_with_context()
7054 textconv: support for cat_file
7055 t/t8007: test textconv support for cat-file
7057 Daniel Knittl-Frank (1):
7058 Show branch information in short output of git status
7061 Add `%B' in format strings for raw commit body in `git log' and friends
7064 diff: add configuration option for disabling diff prefixes.
7067 git svn: avoid unnecessary '/' in paths for SVN
7070 git checkout: create unparented branch by --orphan
7071 Documentation: alter checkout --orphan description
7072 refs: split log_ref_write logic into log_ref_setup
7073 checkout --orphan: respect -l option always
7074 t3200: test -l with core.logAllRefUpdates options
7075 bash completion: add --orphan to 'git checkout'
7078 mingw: use _commit to implement fsync
7080 Eyvind Bernhardsen (4):
7081 Add tests for per-repository eol normalization
7082 Add per-repository eol normalization
7083 Rename the "crlf" attribute "text"
7084 Add "core.eol" config variable
7086 Finn Arne Gangstad (1):
7087 autocrlf: Make it work also for un-normalized repositories
7089 Gary V. Vaughan (17):
7090 Makefile: pass CPPFLAGS through to fllow customization
7091 Rewrite dynamic structure initializations to runtime assignment
7092 Makefile: -lpthread may still be necessary when libc has only pthread stubs
7093 enums: omit trailing comma for portability
7094 Do not use "diff" found on PATH while building and installing
7095 tests: use "test_cmp", not "diff", when verifying the result
7096 test_cmp: do not use "diff -u" on platforms that lack one
7097 git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
7098 Makefile: some platforms do not have hstrerror anywhere
7099 Make NO_{INET_NTOP,INET_PTON} configured independently
7100 Some platforms lack socklen_t type
7101 Allow disabling "inline"
7102 inline declaration does not work on AIX
7103 Makefile: SunOS 5.6 portability fix
7104 Makefile: HPUX11 portability fixes
7105 Makefile: HP-UX 10.20 portability fixes
7106 Makefile: Tru64 portability fix
7108 Giuseppe Scrivano (1):
7109 print the usage string on stdout instead of stderr
7111 Henrik Grubbström (2):
7112 convert: Safer handling of $Id$ contraction.
7113 convert: Keep foreign $Id$ on checkout.
7115 Jakub Narebski (16):
7116 Export more test-related variables when running external tests
7117 gitweb: href(..., -path_info => 0|1)
7118 gitweb: Use nonlocal jump instead of 'exit' in die_error
7119 gitweb: Add custom error handler using die_error
7120 gitweb: Move generating page title to separate subroutine
7121 gitweb: Silence 'Variable VAR may be unavailable' warnings
7122 gitweb: Improve installation instructions in gitweb/INSTALL
7123 gitweb: Create install target for gitweb in Makefile
7124 gitweb: Refactor syntax highlighting support
7125 gitweb: Put all per-connection code in run() subroutine
7126 git-instaweb: Remove pidfile after stopping web server
7127 git-instaweb: Wait for server to start before running web browser
7128 git-instaweb: Add support for running gitweb via 'plackup'
7129 gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
7130 gitweb: Fix typo in hash key name in %opts in git_header_html
7131 gitweb: Return or exit after done serving request
7134 git-am: suggest what to do with superfluous patches
7137 t5516-fetch-push.sh: style cleanup
7140 make commit_tree a library function
7141 introduce notes-cache interface
7142 textconv: refactor calls to run_textconv
7143 diff: cache textconv output
7144 diff: avoid useless filespec population
7145 script with rev-list instead of log
7146 tests: rename duplicate t4205
7147 tests: chmod +x t5150
7148 make url-related functions reusable
7149 decode file:// and ssh:// URLs
7150 Makefile: default pager on AIX to "more"
7153 diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
7154 Documentation/rev-list-options.txt: Fix missing line in example history graph
7155 Documentation/rev-list-options.txt: Explain --ancestry-path
7156 revision: Fix typo in --ancestry-path error message
7157 revision: Turn off history simplification in --ancestry-path mode
7159 Johannes Schindelin (1):
7160 gitweb: Syntax highlighting support
7163 Modernize t5530-upload-pack-error.
7164 Make report() from usage.c public as vreportf() and use it.
7165 Fix signature of fcntl() compatibility dummy
7166 Windows: more pthreads functions
7167 Reimplement async procedures using pthreads
7168 Dying in an async procedure should only exit the thread, not the process.
7169 Enable threaded async procedures whenever pthreads is available
7170 Have set_try_to_free_routine return the previous routine
7171 Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
7172 Recent MinGW has a C99 implementation of snprintf functions
7173 merge-recursive: demonstrate an incorrect conflict with submodule
7175 Jonathan Nieder (17):
7176 t7400: split setup into multiple tests
7177 t7400: clarify 'submodule add' tests
7178 t7400: clarify submodule update tests
7179 t5800: testgit helper requires Python support
7180 tests for request-pull
7181 request-pull: protect against OPTIONS_KEEPDASHDASH from environment
7182 fsck: check ident lines in commit objects
7183 adapt request-pull tests for new pull request format
7184 pretty: initialize new cmt_fmt_map to 0
7185 Makefile: fix header dependency checker to allow NO_CURL builds
7186 Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
7187 git svn: avoid uninitialized var in 'reset'
7188 Add git remote set-branches
7189 fsck: fix bogus commit header check
7190 rebase: improve error message when upstream argument is missing
7191 DWIM 'git show -5' to 'git show --do-walk -5'
7192 git-svn: strip off leading slashes on --trunk argument
7194 Junio C Hamano (31):
7195 git_config_maybe_bool()
7196 log.decorate: usability fixes
7197 whitespace: we cannot "catch all errors known to git" anymore
7198 GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
7199 Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
7200 log --pretty/--oneline: ignore log.decorate
7201 war on "sleep" in tests
7202 reflog --expire-unreachable: avoid merge-base computation
7203 log.decorate: only ignore it under "log --pretty=raw"
7204 wt-status: remove unused workdir_untracked member
7205 wt-status: plug memory leak while collecting untracked files
7206 wt-status: collect ignored files
7207 wt-status: rename and restructure status-print-untracked
7208 status: --ignored option shows ignored files
7209 Document gc.<pattern>.reflogexpire variables
7210 more war on "sleep" in tests
7211 reflog --expire-unreachable: special case entries in "HEAD" reflog
7212 revision: --ancestry-path
7213 wt-status: fix 'fprintf' compilation warning
7214 t5150: protect backslash with backslash in shell
7216 fixup: do not unconditionally disable "diff -u"
7217 build: propagate $DIFF to scripts
7218 test-lib: use DIFF definition from GIT-BUILD-OPTIONS
7219 Update draft release notes to 1.7.2
7220 Update draft release notes to 1.7.2
7221 Update draft release notes to 1.7.2
7222 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
7223 Update draft release notes to 1.7.2
7224 url.c: "<scheme>://" part at the beginning should not be URL decoded
7227 Lars R. Damerow (3):
7228 config.c: remove static keyword from git_env_bool()
7229 truncate cwd string before printing error message
7230 Add support for GIT_ONE_FILESYSTEM
7233 Make :/ accept a regex rather than a fixed pattern
7235 Michael J Gruber (5):
7236 for-each-ref: Field with abbreviated objectname
7237 notes: dry-run and verbose options for prune
7238 Documentation+t5708: document and test status -s -b
7239 pretty: Introduce ' ' modifier to add space if non-empty
7240 git-cat-file.txt: Document --textconv
7242 Michael J. Kiwala (1):
7243 git svn: fix empty directory creation
7246 patch-id: extract parsing one diff out of generate_id_list
7247 patch-id: Add support for mbox format
7249 Pavan Kumar Sunkara (6):
7250 gitweb: Use @diff_opts while using format-patch
7251 gitweb: Move static files into seperate subdirectory
7252 gitweb: Set default destination directory for installing gitweb in Makefile
7253 git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
7254 git-instaweb: Configure it to work with new gitweb structure
7255 git-web--browse: Add support for google chrome and chromium
7257 Ramkumar Ramachandra (4):
7258 git am: Set cmdline globally
7259 git am: Display some help text when patch is empty
7260 git am: Remove stray error message from sed
7261 Refactor parse_date for approxidate functions
7264 grep: add test script for binary file handling
7265 grep: grep: refactor handling of binary mode options
7266 grep: --count over binary
7267 grep: --name-only over binary
7268 grep: use memmem() for fixed string search
7269 grep: continue case insensitive fixed string search after NUL chars
7270 grep: use REG_STARTEND for all matching if available
7271 grep: support NUL chars in search strings for -F
7274 gitweb: Add support for FastCGI, using CGI::Fast
7275 git-cvsserver: use a password file cvsserver pserver
7278 Honor "tagopt = --tags" configuration option
7279 remote add: add a --[no-]tags option
7282 branch: exit status now reflects if branch listing finds an error
7283 branch: don't fail listing branches if one of the commits wasn't found
7286 format-patch: Add a signature option (--signature)
7287 completion: Add --signature and format.signature
7290 Add `log.decorate' configuration variable.
7292 Sverre Rabbelier (7):
7293 clone: pass the remote name to remote_get
7294 clone: also configure url for bare clones
7295 fast-import: always create marks_file directories
7296 remote-helpers: allow requesing the path to the .git directory
7297 remote-helpers: add support for an export command
7298 remote-helpers: add testgit helper
7299 remote-helpers: add tests for testgit helper
7302 ls-remote: fall-back to default remotes when no remote specified
7303 ls-remote: print URL when no repo is specified
7306 diff: add --word-diff option that generalizes --color-words
7307 Complete prototype of git_config_from_parameters()
7308 fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
7309 log_ref_setup: don't return stack-allocated array
7310 parseopt: wrap rev-parse --parseopt usage for eval consumption
7312 Torsten Schmutzler (1):
7313 git-svn: mangle refnames forbidden in git
7316 pretty: make it easier to add new formats
7317 pretty: add infrastructure for commit format aliases
7318 pretty: add aliases for pretty formats
7319 diff-options: make --patch a synonym for -p
7321 Ævar Arnfjörð Bjarmason (12):
7322 Add option to git-commit to allow empty log messages
7323 git-svn documentation: minor grammar fix
7324 git-svn: Remove unused use of File::Temp
7325 git-cvsserver: authentication support for pserver
7326 git-cvsserver: indent & clean up authdb code
7327 git-cvsserver: Improved error handling for pserver
7328 git-cvsserver: document making a password without htpasswd
7329 git-cvsserver: test for pserver authentication support
7330 git-submodule foreach: Add $toplevel variable
7331 Makefile: remove redundant munging of @@INSTLIBDIR@@
7332 git-cvsserver: typo in a comment: bas -> has
7333 git-cvsserver: fix error for invalid password formats
7336 Version v1.7.1.4; changes since v1.7.1.3:
7337 -----------------------------------------
7340 gitweb: Introduce esc_attr to escape attributes of HTML elements
7346 Version v1.7.1.3; changes since v1.7.1.2:
7347 -----------------------------------------
7349 Jonathan Nieder (1):
7350 add: introduce add.ignoreerrors synonym for add.ignore-errors
7356 t0003: add missing && at end of lines
7359 Version v1.7.1.2; changes since v1.7.1.1:
7360 -----------------------------------------
7363 t/README: clarify test_must_fail description
7366 Documentation/git-gc.txt: add reference to githooks
7369 Documentation: Explain git-mergetool's use of temporary files
7372 xdiff: optimise for no whitespace difference when ignoring whitespace.
7374 Fredrik Skolmli (1):
7375 Documentation: Spelling fix in protocol-capabilities.txt
7378 Check size of path buffer before writing into it
7379 Check size of path buffer before writing into it
7382 add missing && to submodule-merge testcase
7385 receive-pack: switch global variable 'commands' to a parameter
7386 receive-pack: detect aliased updates which can occur with symrefs
7389 t0006: test timezone parsing
7390 test-date: fix sscanf type conversion
7393 t0005: work around strange $? in ksh when program terminated by a signal
7395 Jonathan Nieder (3):
7396 gitmodules.5: url can be a relative path
7397 Documentation: add submodule.* to the big configuration variable list
7398 config --get --path: check for unset $HOME
7401 backmerge a few more fixes to 1.7.1.X series
7405 Michael J Gruber (3):
7406 git-rev-parse.txt: Document ":path" specifier
7407 git-rev-parse.txt: Add more examples for caret and colon
7408 rerere.txt: Document forget subcommand
7411 format-patch: document the format.to configuration setting
7413 Nicolas Sebrecht (1):
7414 checkout: accord documentation to what git does
7417 git fetch documentation: describe short '-p' synonym to '--prune' option
7419 Pavan Kumar Sunkara (1):
7422 Pierre Habouzit (1):
7423 fix git branch -m in presence of cross devices
7426 update-server-info: Shorten read_pack_info_file()
7429 request-pull.txt: Document -p option
7432 check_aliased_update: strcpy() instead of strcat() to copy
7434 Uwe Kleine-König (1):
7435 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
7438 Version v1.7.1.1; changes since v1.7.1:
7439 ---------------------------------------
7441 Alexey Mahotkin (1):
7442 xdiff/xmerge.c: use memset() instead of explicit for-loop
7445 diff: fix coloring of extended diff headers
7447 Björn Gustavsson (1):
7448 apply: Allow blank *trailing* context lines to match beyond EOF
7450 Björn Steinbrink (1):
7451 diff: Support visibility modifiers in the PHP hunk header regexp
7454 blame-options.txt: Add default value for `-M/-C` options.
7457 t/t9001: use egrep when regular expressions are involved
7460 unpack-trees: Make index lookahead less pessimal
7462 Brian Gernhardt (4):
7463 send-email: Cleanup { style
7464 send-email: Don't use FQDNs without a '.'
7465 Document send-email --smtp-domain
7466 send-email: Cleanup smtp-domain and add config
7469 stash: Don't overwrite files that have gone from the index
7470 stash tests: stash can lose data in a file removed from the index
7473 exec_cmd.c: replace hard-coded path list with one from <paths.h>
7475 Christian Couder (3):
7476 diff: fix "git show -C -C" output when renaming a binary file
7477 commit: use value of GIT_REFLOG_ACTION env variable as reflog message
7478 Documentation: grep: fix asciidoc problem with --
7480 Clemens Buchacher (7):
7481 do not overwrite files marked "assume unchanged"
7482 Documentation: git-add does not update files marked "assume unchanged"
7483 test get_git_work_tree() return value for NULL
7484 get_cwd_relative(): do not misinterpret suffix as subdirectory
7485 setup: document prefix
7486 quote.c: separate quoting and relative path generation
7487 ls-files: allow relative pathspec
7490 hash_object: correction for zero length file
7492 Gary V. Vaughan (1):
7493 git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
7496 git-submodule.sh: properly initialize shell variables
7498 Henrik Grubbström (3):
7499 attr: Fixed debug output for macro expansion.
7500 attr: Allow multiple changes to an attribute on the same line.
7501 attr: Expand macros immediately when encountered.
7504 Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
7506 Ian Ward Comfort (1):
7507 rebase -i: Abort cleanly if new base cannot be checked out
7510 autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
7513 commit.txt: clarify how --author argument is used
7514 am: use get_author_ident_from_commit instead of mailinfo when rebasing
7515 gitweb/Makefile: fix typo in gitweb.min.css rule
7518 handle "git --bare init <dir>" properly
7519 docs: clarify meaning of -M for git-log
7520 remove over-eager caching in sha1_file_name
7521 pull: do nothing on --dry-run
7522 commit: give advice on empty amend
7523 Makefile: default pager on AIX to "more"
7524 notes: check number of parameters to "git notes copy"
7527 Thread-safe xmalloc and xrealloc needs a recursive mutex
7529 Jonathan Nieder (25):
7530 t7006: guard cleanup with test_expect_success
7531 t5704 (bundle): add tests for bundle --stdin
7532 fix "bundle --stdin" segfault
7533 test-lib: Let tests specify commands to be run at end of test
7534 commit --amend: cope with missing display name
7535 Documentation/shortlog: scripted users should not rely on implicit HEAD
7536 t4201 (shortlog): guard setup with test_expect_success
7537 t4201 (shortlog): Test output format with multiple authors
7538 shortlog: Document and test --format option
7539 test-lib: some shells do not let $? propagate into an eval
7540 cherry-pick: do not dump core when iconv fails
7541 Documentation/notes: document format of notes trees
7542 Documentation/notes: describe content of notes blobs
7543 Documentation/notes: add configuration section
7544 Documentation/notes: simplify treatment of default notes ref
7545 Documentation/log: add a CONFIGURATION section
7546 Documentation/notes: simplify treatment of default display refs
7547 Documentation/notes: clean up description of rewriting configuration
7548 Documentation/notes: nitpicks
7549 post-receive-email: document command-line mode
7550 Documentation/checkout: clarify description
7551 gitignore.5: Clarify matching rules
7552 rebase -i -p: document shortcomings
7553 Documentation/checkout: clarify description
7554 add-interactive: Clarify “remaining hunks in the file”
7556 Junio C Hamano (10):
7557 am -3: recover the diagnostic messages for corrupt patches
7558 clone: quell the progress report from init and report on clone
7559 t9129: fix UTF-8 locale detection
7560 common_prefix: simplify and fix scanning for prefixes
7561 Prepare draft release notes to 1.7.1.1
7562 Update draft release notes to 1.7.1.1
7563 tests: remove unnecessary '^' from 'expr' regular expression
7564 Update draft release notes to 1.7.1.1
7565 Update draft release notes to 1.7.1.1
7568 Leif Arne Storset (1):
7569 Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
7571 Marcus Comstedt (1):
7572 Add "Z" as an alias for the timezone "UTC"
7574 Markus Heidelberg (4):
7575 t7508: add test for "git status" refreshing the index
7576 git status: refresh the index if possible
7577 t7508: add a test for "git status" in a read-only repository
7578 Documentation: rebase -i ignores options passed to "git am"
7580 Michael J Gruber (10):
7581 index-pack: fix trivial typo in usage string
7582 t7508: test advice.statusHints
7583 wt-status: take advice.statusHints seriously
7584 Documentation: fix minor inconsistency
7585 Documentation/gitdiffcore: fix order in pickaxe description
7586 Documentation/SubmittingPatches: clarify GMail section and SMTP
7587 completion: --set-upstream option for git-branch
7588 Makefile: reenable install with NO_CURL
7589 Documentation/config: describe status.submodulesummary
7590 Documentation: A...B shortcut for checkout and rebase
7593 test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
7596 Documentation/pretty-{formats,options}: better reference for "format:<string>"
7599 Make xmalloc and xrealloc thread-safe
7600 index-pack: smarter memory usage when resolving deltas
7601 index-pack: rationalize unpack_entry_data()
7602 index-pack: smarter memory usage when appending objects
7605 clone: reword messages to match the end-user perception
7607 Peter Collingbourne (4):
7608 Generalise the unlink_or_warn function
7609 Implement the rmdir_or_warn function
7610 Introduce remove_or_warn function
7611 Remove a redundant errno test in a usage of remove_path
7613 Philippe Bruhat (1):
7614 Git.pm: better error message
7617 Documentation/git-send-email: Add "Use gmail as the smtp server"
7619 Ramkumar Ramachandra (1):
7620 SubmittingPatches: Add new section about what to base work on
7622 Ramsay Allan Jones (4):
7623 Makefile: Fix 'clean' target to remove all gitweb build files
7624 msvc: Fix some "expr evaluates to function" compiler warnings
7625 msvc: Fix some compiler warnings
7626 notes: Initialise variable to appease gcc
7629 git diff too slow for a file
7630 remove ecb parameter from xdi_diff_outf()
7631 Fix checkout of large files to network shares on Windows XP
7634 Prompt for a username when an HTTP request 401s
7636 Shawn O. Pearce (16):
7637 tag.c: Correct indentation
7638 tag.h: Remove unused signature field
7639 tag.c: Refactor parse_tag_buffer to be saner to program
7640 tag.c: Parse tagger date (if present)
7641 describe: Break annotated tag ties by tagger date
7642 http.c: Remove bad free of static block
7643 t5550-http-fetch: Use subshell for repository operations
7644 http.c: Tiny refactoring of finish_http_pack_request
7645 http.c: Drop useless != NULL test in finish_http_pack_request
7646 http.c: Don't store destination name in request structures
7647 http.c: Remove unnecessary strdup of sha1_to_hex result
7648 Introduce close_pack_index to permit replacement
7649 Extract verify_pack_index for reuse from verify_pack
7650 Allow parse_pack_index on temporary files
7651 http-fetch: Use index-pack rather than verify-pack to check packs
7652 http-fetch: Use temporary files for pack-*.idx until verified
7654 Sverre Rabbelier (1):
7655 Gitweb: ignore built file
7658 t5541-http-push: add test for URLs with trailing slash
7659 http: make end_url_with_slash() public
7660 remote-curl: ensure that URLs have a trailing slash
7661 http.c::new_http_pack_request: do away with the temp variable filename
7662 t7604-merge-custom-message: shift expected output creation
7663 t7604-merge-custom-message: show that --log doesn't append to -m
7664 merge: update comment
7665 merge: rename variable
7666 fmt-merge-msg: minor refactor of fmt_merge_msg()
7667 fmt-merge-msg: refactor merge title formatting
7668 fmt-merge-msg: add function to append shortlog only
7669 merge: --log appends shortlog to message if specified
7670 GIT-VERSION-GEN: restrict tags used
7671 t7502-commit: fix spelling
7672 show-branch: use DEFAULT_ABBREV instead of 7
7673 t7502-commit: add tests for summary output
7674 t7502-commit: add summary output tests for empty and merge commits
7675 commit::print_summary(): don't use format_commit_message()
7678 t/README: document --root option
7679 send-email: ask about and declare 8bit mails
7682 Documentation/SubmittingPatches: Fix typo in GMail section
7685 Change C99 comments to old-style C comments
7688 pretty: Respect --abbrev option
7691 git-mailinfo documentation: clarify -u/--encoding
7694 start_command: close cmd->err descriptor when fork/spawn fails
7696 Ævar Arnfjörð Bjarmason (3):
7697 Move t6000lib.sh to lib-*
7698 Turn setup code in t2007-checkout-symlink.sh into a test
7699 notes: Initialize variable to appease Sun Studio
7702 Version v1.7.1; changes since v1.7.1-rc2:
7703 -----------------------------------------
7706 Documentation improvements for the description of short format.
7709 MSVC: Fix build by adding missing termios.h dummy
7711 Jonathan Nieder (1):
7712 Documentation/Makefile: fix interrupted builds of user-manual.xml
7718 Michael J Gruber (1):
7719 t7012: Mark missing tests as TODO
7722 reflog: remove 'show' from 'expire's usage string
7725 Version v1.7.1-rc2; changes since v1.7.1-rc1:
7726 ---------------------------------------------
7729 Documentation: Describe other situations where -z affects git diff
7732 git-instaweb: pass through invoking user's path to gitweb CGI scripts
7735 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
7738 diff: use large integers for diffstat calculations
7739 rebase-interactive: silence warning when no commits rewritten
7742 gitk: Add Ctrl-W shortcut for closing the active window
7743 gitk: Display dirty submodules correctly
7745 Johannes Gilger (1):
7746 pretty: Initialize notes if %N is used
7749 Windows: start_command: Support non-NULL dir in struct child_process
7751 Jonathan Nieder (5):
7752 gitk: Add comments to explain encode_view_opts and decode_view_opts
7753 gitk: Don't clobber "Remember this view" setting
7754 Add .depend directories to .gitignore
7755 Document new "already-merged" rule for branch -d
7756 tag -v: use RUN_GIT_CMD to run verify-tag
7759 SubmittingPatches: update GMail section
7760 blame documentation: -M/-C notice copied lines as well as moved ones
7762 gitweb: simplify gitweb.min.* generation and clean-up rules
7763 t3301: add tests to use --format="%N"
7767 Docs: Add -X option to git-merge's synopsis.
7770 gitk: Remove forced use of sans-serif font
7771 gitk: Set the font for all spinbox widgets
7772 gitk: Set the font for all listbox widgets
7773 gitk: Use consistent font for all text input fields
7775 Matthew Ogilvie (1):
7776 t6006: do not write to /tmp
7778 Michael J Gruber (1):
7779 t1010-mktree: Adjust expected result to code and documentation
7782 gitk: Avoid calling tk_setPalette on Windows
7783 gitk: Add emacs editor variable block
7784 gitk: Fix display of copyright symbol
7786 Ramkumar Ramachandra (5):
7787 Documentation/remote-helpers: Rewrite description
7788 Documentation/urls: Rewrite to accomodate <transport>::<address>
7789 Documentation/remote-helpers: Add invocation section
7790 Fixup: Second argument may be any arbitrary string
7791 Documentation/remote-helpers: Fix typos and improve language
7794 t3507: Make test executable
7797 combined diff: correctly handle truncated file
7800 documentation: clarify direction of core.autocrlf
7803 Version v1.7.1-rc1; changes since v1.7.1-rc0:
7804 ---------------------------------------------
7807 notes.h: declare bit field as unsigned to silence compiler complaints
7810 fix const-correctness of write_sha1_file
7811 fix textconv leak in emit_rewrite_diff
7812 fix typos and grammar in 1.7.1 draft release notes
7813 docs: clarify "branch -l"
7816 Let check_preimage() use memset() to initialize "struct checkout"
7817 Teach diff --submodule and status to handle .git files in submodules
7819 Jonathan Nieder (1):
7820 Teach mailinfo %< as an alternative scissors mark
7823 diff.c: work around pointer constness warnings
7827 Gitweb: add ignore and clean rules for minified files
7828 Gitweb: add support for minifying gitweb.css
7829 Gitweb: add autoconfigure support for minifiers
7830 instaweb: add minification awareness
7831 gitweb: add documentation to INSTALL regarding gitweb.js
7832 gitweb: update INSTALL to use shorter make target
7834 Michael J Gruber (2):
7835 t3301-notes: Test the creation of reflog entries
7836 refs.c: Write reflogs for notes just like for branch heads
7839 branch: say "Reset to" in reflog entries for 'git branch -f' operations
7840 fetch/push: fix usage strings
7843 Version v1.7.1-rc0; changes since v1.7.0.9:
7844 -------------------------------------------
7847 cvsimport: new -R option: generate .git/cvs-revisions mapping
7850 everyday: fsck and gc are not everyday operations
7853 Make templates honour SHELL_PATH and PERL_PATH
7854 Modernize git calling conventions in hook templates
7856 Benjamin C Meyer (1):
7857 Fix a spelling mistake in a git-p4 console message
7860 make union merge an xdl merge favor
7861 refactor merge flags into xmparam_t
7862 merge-file: add option to specify the marker size
7863 merge-file: add option to select union merge favor
7866 t/t1304: avoid -d option to setfacl
7867 t/t1304: set the Default ACL base entries
7868 t/t1304: use 'test -r' to test readability rather than looking at mode bits
7869 t/t1304: set the ACL effective rights mask
7870 t/t1304: make a second colon optional in the mask ACL check
7871 notes.c: remove inappropriate call to return
7872 t5505: remove unnecessary subshell invocations
7873 t5505: add missing &&
7874 t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
7876 Brian Gernhardt (1):
7877 Use test_expect_success for test setups
7880 imap-send: suppress warning about cleartext password with CRAM-MD5
7882 Christian Couder (8):
7883 reset: add option "--keep" to "git reset"
7884 reset: add test cases for "--keep" option
7885 Documentation: reset: describe new "--keep" option
7886 reset: disallow "reset --keep" outside a work tree
7887 reset: disallow using --keep when there are unmerged entries
7888 cherry-pick: add tests for new --ff option
7889 Documentation: describe new cherry-pick --ff option
7890 rebase -i: use new --ff cherry-pick option
7893 rebase--interactive: don't require what's rebased to be a branch
7896 Makefile: update defaults for modern Cygwin
7899 Integrate version 3 ciabot scripts into contrib/.
7902 hash-object: support --stdin-paths with --no-filters
7903 git-svn: support fetch with autocrlf on
7904 Revert "git-svn: always initialize with core.autocrlf=false"
7905 cherry: support --abbrev option
7906 ls: remove redundant logic
7909 fallback SSH_ASKPASS when GIT_ASKPASS not set
7910 git-svn: Support retrieving passwords with GIT_ASKPASS
7911 git-core: Support retrieving passwords with GIT_ASKPASS
7914 imap-send: support CRAM-MD5 authentication
7916 Ian Ward Comfort (1):
7917 RPM spec: include bash completion support
7919 Ilari Liusvaara (1):
7920 Allow '+', '-' and '.' in remote helper names
7923 gitweb: esc_html (short) error message in die_error
7924 gitweb: Protect escaping functions against calling on undef
7927 git-send-email.perl: improve error message in send_message()
7928 git-send-email.perl: add option --smtp-debug
7929 git-send-email.perl - try to give real name of the calling host to HELO/EHLO
7932 submodule summary: do not shift a non-existent positional variable
7935 git diff --submodule: Show detailed dirty status of submodules
7936 git status: Show detailed dirty status of submodules in long format
7937 git submodule summary: Handle HEAD as argument when on an unborn branch
7938 Refactor dirty submodule detection in diff-lib.c
7939 git status: Fix false positive "new commits" output for dirty submodules
7940 git status: ignoring untracked files must apply to submodules too
7943 Minor cosmetic fixes to notes.c
7944 Notes API: get_commit_notes() -> format_note() + remove the commit restriction
7945 Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
7946 Notes API: init_notes(): Initialize the notes tree from the given notes ref
7947 Notes API: add_note(): Add note objects to the internal notes tree structure
7948 Notes API: remove_note(): Remove note objects from the notes tree structure
7949 Notes API: get_note(): Return the note annotating the given object
7950 Notes API: for_each_note(): Traverse the entire notes tree with a callback
7951 Notes API: write_notes_tree(): Store the notes tree in the database
7952 Notes API: Allow multiple concurrent notes trees with new struct notes_tree
7953 Refactor notes concatenation into a flexible interface for combining notes
7954 Builtin-ify git-notes
7955 t3301: Verify successful annotation of non-commits
7956 t3305: Verify that adding many notes with git-notes triggers increased fanout
7957 Teach notes code to properly preserve non-notes in the notes tree
7958 Teach builtin-notes to remove empty notes
7959 builtin-notes: Add "remove" subcommand for removing existing notes
7960 t3305: Verify that removing notes triggers automatic fanout consolidation
7961 Notes API: prune_notes(): Prune notes that belong to non-existing objects
7962 builtin-notes: Add "prune" subcommand for removing notes for missing objects
7963 Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
7964 builtin-notes: Add "list" subcommand for listing note objects
7965 builtin-notes: Add --message/--file aliases for -m/-F options
7966 builtin-notes: Add "add" subcommand for adding notes to objects
7967 builtin-notes: Add "append" subcommand for appending to note objects
7968 builtin-notes: Deprecate the -m/-F options for "git notes edit"
7969 builtin-notes: Refactor handling of -F option to allow combining -m and -F
7970 builtin-notes: Add -c/-C options for reusing notes
7971 builtin-notes: Misc. refactoring of argc and exit value handling
7972 builtin-notes: Add "copy" subcommand for copying notes between objects
7973 submodule summary: Don't barf when invoked in an empty repo
7974 builtin-notes: Minor (mostly parse_options-related) fixes
7977 Print RUNTIME_PREFIX warning only when GIT_TRACE is set
7978 Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
7980 Jonathan Nieder (33):
7981 Makefile: add missing header file dependencies
7982 Makefile: make sure test helpers are rebuilt when headers change
7983 Makefile: remove wt-status.h from LIB_H
7984 Makefile: clean up http-walker.o dependency rules
7985 Makefile: drop dependency on $(wildcard */*.h)
7986 Makefile: transport.o depends on branch.h now
7987 Makefile: rearrange dependency rules
7988 Makefile: disable default implicit rules
7989 Makefile: list generated object files in OBJECTS
7990 Makefile: lazily compute header dependencies
7991 Makefile: list standalone program object files in PROGRAM_OBJS
7992 Teach Makefile to check header dependencies
7993 Do not install shell libraries executable
7994 Makefile: tuck away generated makefile fragments in .depend
7995 Makefile: always remove .depend directories on 'make clean'
7996 Makefile: clarify definition of TEST_OBJS
7997 Makefile: Fix occasional GIT-CFLAGS breakage
7998 revert: fix tiny memory leak in cherry-pick --ff
7999 tests: document format of conflicts from checkout -m
8000 tests: document cherry-pick behavior in face of conflicts
8001 xdl_merge(): add optional ancestor label to diff3-style output
8002 xdl_merge(): move file1 and file2 labels to xmparam structure
8003 merge-file --diff3: add a label for ancestor
8004 ll_merge(): add ancestor label parameter for diff3-style output
8005 checkout --conflict=diff3: add a label for ancestor
8006 merge_file(): add comment explaining behavior wrt conflict style
8007 merge_trees(): add ancestor label parameter for diff3-style output
8008 checkout -m --conflict=diff3: add a label for ancestor
8009 compat: add mempcpy()
8010 revert: clarify label on conflict hunks
8011 cherry-pick, revert: add a label for ancestor
8012 merge-recursive: add a label for ancestor
8013 Makefile: future-proof Cygwin version check
8015 Junio C Hamano (25):
8016 builtin-for-each-ref.c: comment fixes
8017 builtin-for-each-ref.c: check if we need to peel onion while parsing the format
8018 for-each-ref --format='%(symref) %(symref:short)'
8019 for-each-ref --format='%(flag)'
8021 Resurrect "git grep --no-index"
8022 Update draft release notes to 1.7.1
8023 notes: fix malformed tree entry
8024 wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
8025 submodule summary: do not fail before the first commit
8026 parse-options: add parse_options_concat() to concat options
8027 builtin/merge: make checkout_fast_forward() non static
8028 revert: add --ff option to allow fast forward when cherry-picking
8029 Update draft release notes to 1.7.1
8030 Documentation: improve description of "git reset --keep"
8031 t4013: add tests for log -p -m --first-parent
8032 revision: introduce setup_revision_opt
8033 show -c: show patch text
8034 show --first-parent/-m: do not default to --cc
8035 Makefile: update check-docs target
8036 t5516: Use test_cmp when appropriate
8037 Update draft release notes to 1.7.1
8038 Update draft release notes to 1.7.1
8039 Revert "Link against libiconv on IRIX"
8043 git-push: fix an advice message so it goes to stderr
8044 git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
8045 git-push: make git push --porcelain print "Done"
8046 git-push: add tests for git push --porcelain
8049 Move 'builtin-*' into a 'builtin/' subdirectory
8052 Teach rebase the --no-ff option.
8055 Add an optional argument for --color options
8056 Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
8057 grep: Colorize filename, line number, and separator
8058 grep: Colorize selected, context, and function lines
8060 Markus Heidelberg (2):
8061 builtin/commit: fix duplicated sentence in a comment
8062 builtin/commit: remove unnecessary variable definition
8064 Michael J Gruber (4):
8065 git-svn: req_svn when needed
8066 t9119-git-svn-info.sh: test with svn 1.6.* as well
8067 Documentation: fix a few typos in git-notes.txt
8068 git-svn: make git svn --version work again
8070 Michael Lukashov (4):
8071 connect.c: move duplicated code to a new function 'get_host_and_port'
8072 refactor duplicated code in builtin-send-pack.c and transport.c
8073 refactor duplicated fill_mm() in checkout and merge-recursive
8074 refactor duplicated encode_header in pack-objects and fast-import
8076 Michele Ballabio (1):
8077 shortlog: warn the user when there is no input
8080 request-pull: avoid mentioning that the start point is a single commit
8082 Nguyễn Thái Ngọc Duy (5):
8083 make_absolute_path(): Do not append redundant slash
8084 init-db, rev-parse --git-dir: do not append redundant slash
8085 Move offset_1st_component() to path.c
8086 Support working directory located at root
8087 Add test for using Git at root of file system
8090 move encode_in_pack_object_header() to a better place
8093 git log -p -m: document -m and honor --first-parent
8096 setenv(GIT_DIR) clean-up
8097 grep: enable threading for context line printing
8100 bash: improve aliased command recognition
8101 bash: support user-supplied completion scripts for user's git commands
8102 bash: support user-supplied completion scripts for aliases
8103 bash: completion for gitk aliases
8106 documentation: 'git-mailsplit --keep-cr' is not hidden anymore
8107 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
8108 git-am: Add am.keepcr and --no-keep-cr to override it
8109 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
8112 format-patch: use a string_list for headers
8113 format-patch: add --no-cc, --no-to, and --no-add-headers
8114 send-email: add --no-cc, --no-to, and --no-bcc
8115 notes: rework subcommands and parse options
8116 fmt-merge-msg: be quiet if nothing to merge
8117 t6200: modernize with test_tick
8118 t6200: test fmt-merge-msg more
8119 fmt-merge-msg: use pretty.c routines
8120 string-list: add unsorted_string_list_lookup()
8121 fmt-merge-msg: remove custom string_list implementation
8122 fmt-merge-msg: hide summary option
8125 Add `init.templatedir` configuration variable.
8126 Add a "TEMPLATE DIRECTORY" section to git-init[1].
8127 init: having keywords without value is not a global error.
8128 t/t0001-init.sh: add test for 'init with init.templatedir set'
8129 Add 'git format-patch --to=' option and 'format.to' configuration variable.
8132 Documentation/git-clone: mention progress in -v
8133 Documentation/git-pull: put verbosity options before merge/fetch ones
8134 Documentation/git-push: put --quiet before --verbose
8135 fetch: refactor verbosity option handling into transport.[ch]
8136 push: support multiple levels of verbosity
8137 clone: support multiple levels of verbosity
8138 transport->progress: use flag authoritatively
8139 push: learn --progress
8140 fetch and pull: learn --progress
8141 transport: update flags to be in running order
8142 t5541-http-push: check that ref is unchanged for non-ff test
8143 t554[01]-http-push: refactor, add non-ff tests
8144 http-push: remove "|| 1" to enable verbose check
8145 http-walker: cleanup more thoroughly
8146 http: init and cleanup separately from http-walker
8147 remote-curl: use http_fetch_ref() instead of walker wrapper
8148 remote-curl: init walker only when needed
8151 test-lib: unset GIT_NOTES_REF to stop it from influencing tests
8152 Support showing notes from more than one notes tree
8153 Documentation: document post-rewrite hook
8154 commit --amend: invoke post-rewrite hook
8155 rebase: invoke post-rewrite hook
8156 rebase -i: invoke post-rewrite hook
8157 notes: implement 'git notes copy --stdin'
8158 notes: implement helpers needed for note copying during rewrite
8159 rebase: support automatic notes copying
8160 commit --amend: copy notes to the new commit
8161 notes: add shorthand --ref to override GIT_NOTES_REF
8162 notes: track whether notes_trees were changed at all
8163 git-notes(1): add a section about the meaning of history
8164 rebase -i: make post-rewrite work for 'edit'
8167 t9151: Fix a few commits in the SVN dump
8168 t9151: Add two new svn:mergeinfo test cases
8169 git-svn: Fix discarding of extra parents from svn:mergeinfo
8170 git-svn: Fix merge detecting with rewrite-root
8171 t9150,t9151: Add rewrite-root option to init
8173 YONETANI Tomokazu (1):
8174 Fix _XOPEN_SOURCE problem on DragonFly
8177 git svn: delay importing SVN::Base until it is needed
8180 Version v1.7.0.9; changes since v1.7.0.8:
8181 -----------------------------------------
8184 gitweb: Introduce esc_attr to escape attributes of HTML elements
8190 Version v1.7.0.8; changes since v1.7.0.7:
8191 -----------------------------------------
8193 Jonathan Nieder (1):
8194 add: introduce add.ignoreerrors synonym for add.ignore-errors
8200 Version v1.7.0.7; changes since v1.7.0.6:
8201 -----------------------------------------
8204 Documentation improvements for the description of short format.
8207 git-submodule.sh: properly initialize shell variables
8210 Check size of path buffer before writing into it
8212 Jonathan Nieder (1):
8213 config --get --path: check for unset $HOME
8218 Michael J Gruber (3):
8219 index-pack: fix trivial typo in usage string
8220 Makefile: reenable install with NO_CURL
8221 Documentation/config: describe status.submodulesummary
8224 remove ecb parameter from xdi_diff_outf()
8227 request-pull.txt: Document -p option
8229 Uwe Kleine-König (1):
8230 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
8233 Version v1.7.0.6; changes since v1.7.0.5:
8234 -----------------------------------------
8237 Documentation: Describe other situations where -z affects git diff
8240 Makefile: Remove usage of deprecated Python "has_key" method
8243 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
8246 diff: use large integers for diffstat calculations
8249 MSVC: Fix build by adding missing termios.h dummy
8251 Jonathan Nieder (2):
8252 Document new "already-merged" rule for branch -d
8253 Documentation/Makefile: fix interrupted builds of user-manual.xml
8259 Docs: Add -X option to git-merge's synopsis.
8261 Michael J Gruber (3):
8262 rev-list: use default abbrev length when abbrev-commit is in effect
8263 t1010-mktree: Adjust expected result to code and documentation
8264 t7012: Mark missing tests as TODO
8267 reflog: remove 'show' from 'expire's usage string
8270 combined diff: correctly handle truncated file
8273 documentation: clarify direction of core.autocrlf
8276 Version v1.7.0.5; changes since v1.7.0.4:
8277 -----------------------------------------
8280 daemon.c: avoid accessing ss_family member of struct sockaddr_storage
8283 rev-list: fix --pretty=oneline with empty message
8286 Improve error messages from 'git stash show'
8289 docs: clarify "branch -l"
8292 Let check_preimage() use memset() to initialize "struct checkout"
8295 diff --check: honor conflict-marker-size attribute
8296 blame documentation: -M/-C notice copied lines as well as moved ones
8299 Michael J Gruber (2):
8300 .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
8301 send-email: lazily assign editor variable
8303 R. Tyler Ballance (1):
8304 Correct references to /usr/bin/python which does not exist on FreeBSD
8306 Ramkumar Ramachandra (1):
8307 imap-send: Remove limitation on message body
8309 Shawn O. Pearce (1):
8310 http-backend: Don't infinite loop during die()
8313 pack-protocol.txt: fix spelling
8314 pack-protocol.txt: fix pkt-line lengths
8315 branch: say "Reset to" in reflog entries for 'git branch -f' operations
8316 fetch/push: fix usage strings
8319 Version v1.7.0.4; changes since v1.7.0.3:
8320 -----------------------------------------
8322 Björn Gustavsson (5):
8323 apply: Don't unnecessarily update line lengths in the preimage
8324 apply: Remove the quick rejection test
8325 apply: Allow blank context lines to match beyond EOF
8326 t4124: Add additional tests of --whitespace=fix
8327 t3417: Add test cases for "rebase --whitespace=fix"
8330 test for add with non-existent pathspec
8333 difftool: Fix '--gui' when diff.guitool is unconfigured
8336 Documentation: Clarify support for smart HTTP backend
8339 Don't redefine htonl and ntohl on big-endian
8340 Link against libiconv on IRIX
8341 Documentation: show-ref <pattern>s are optional
8344 gitweb: git_get_project_config requires only $git_dir, not also $project
8347 Updated the usage string of git reset
8350 dir: fix COLLECT_IGNORED on excluded prefixes
8353 diff: fix textconv error zombies
8354 Windows: fix utime() for read-only files
8357 git add -u: die on unmatched pathspec
8358 color: allow multiple attributes
8359 t0050: mark non-working test as such
8360 tests for "git add ignored-dir/file" without -f
8361 refs: ref entry with NULL sha1 is can be a dangling symref
8362 t9350: fix careless use of "cd"
8367 format-patch: Squelch 'fatal: Not a range." error
8369 Markus Heidelberg (1):
8370 Documentation: explain the meaning of "-g" in git-describe output
8372 Sverre Rabbelier (1):
8373 fast-export: don't segfault when marks file cannot be opened
8376 Version v1.7.0.3; changes since v1.7.0.2:
8377 -----------------------------------------
8380 prune: honor --expire=never
8381 reflog: honor gc.reflogexpire=never
8383 Andreas Gruenbacher (3):
8384 fetch: Check for a "^{}" suffix with suffixcmp()
8385 fetch: Future-proof initialization of a refspec on stack
8386 fetch: Fix minor memory leak
8389 don't use default revision if a rev was specified
8391 Filippo Negroni (1):
8392 Fix gitmkdtemp: correct test for mktemp() return value
8394 Giuseppe Bilotta (5):
8395 Refactor list of of repo-local env vars
8396 rev-parse: --local-env-vars option
8397 shell setup: clear_local_git_env() function
8398 submodules: ensure clean environment when operating in a submodule
8399 is_submodule_modified(): clear environment properly
8401 Ian Ward Comfort (1):
8402 bash: complete *_HEAD refs if present
8405 daemon: parse_host_and_port SIGSEGV if port is specified
8408 add-interactive: fix bogus diff header line ordering
8409 push: fix segfault for odd config
8411 Jonathan Nieder (1):
8412 Makefile: Fix CDPATH problem
8414 Junio C Hamano (12):
8415 "log --author=me --grep=it" should find intersection, not union
8416 Reword "detached HEAD" notification
8417 mailinfo: do not strip leading spaces even for a header line
8418 t5521: fix and modernize
8419 builtin-fetch --all/--multi: propagate options correctly
8420 fetch --all/--multiple: keep all the fetched branch information
8421 pack-objects documentation: reword "objects that appear in the standard input"
8422 Merge accumulated fixes to prepare for 1.7.0.3
8423 t9400: Use test_cmp when appropriate
8424 t/Makefile: remove test artifacts upon "make clean"
8425 Update draft release notes to 1.7.0.3
8429 grep docs: pluralize "Example" section
8430 grep docs: use AsciiDoc literals consistently
8431 grep docs: --cached and <tree>... are incompatible
8432 grep docs: document --no-index option
8435 Add a testcase for ACL with restrictive umask.
8436 Move gitmkstemps to path.c
8437 git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
8438 Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
8439 git_mkstemps_mode: don't set errno to EINVAL on exit.
8440 Use git_mkstemp_mode instead of plain mkstemp to create object files
8442 Michael J Gruber (7):
8443 Documentation/git-read-tree: fix table layout
8444 Documentation/git-read-tree: clarify 2-tree merge
8445 Documentation/git-reflog: Fix formatting of command lists
8446 Documentation/gitdiffcore: Remove misleading date in heading
8447 Documentation/urls: Remove spurious example markers
8448 Documentation/git-clone: Transform description list into item list
8449 .mailmap: Map the the first submissions of MJG by e-mail
8452 run-command.c: fix build warnings on Ubuntu
8455 Documentation: pack-objects: Clarify --local's semantics.
8456 pack-objects documentation: Fix --honor-pack-keep as well.
8459 blame: fix indent of line numbers
8460 for_each_recent_reflog_ent(): use strbuf, fix offset handling
8463 pull: replace unnecessary sed invocation
8466 Documentation: receive.denyCurrentBranch defaults to 'refuse'
8469 Version v1.7.0.2; changes since v1.7.0.1:
8470 -----------------------------------------
8473 unset GREP_OPTIONS in test-lib.sh
8475 Christian Couder (1):
8476 bisect: error out when passing bad path parameters
8479 hash-object: don't use mmap() for small files
8482 run-command: support custom fd-set in async
8485 require_work_tree broken with NONGIT_OK
8488 git-imap-send: Convert LF to CRLF before storing patch to draft box
8491 gitweb: Die if there are parsing errors in config file
8492 gitweb: Fix project-specific feature override behavior
8494 Jonathan Nieder (8):
8495 Fix 'git var' usage synopsis
8496 Make 'git var GIT_PAGER' always print the configured pager
8497 git.1: Clarify the behavior of the --paginate option
8498 git svn: Fix launching of pager
8499 am: Fix launching of pager
8500 tests: Add tests for automatic use of pager
8501 t7006-pager: if stdout is not a terminal, make a new one
8502 tests: Fix race condition in t7006-pager
8505 t6000lib: Fix permission
8506 lib-patch-mode.sh: Fix permission
8507 status: preload index to optimize lstat(2) calls
8508 Start preparing for 1.7.0.2
8509 Update draft release notes to 1.7.0.2
8513 git diff --quiet -w: check and report the status
8514 git-diff: add a test for git diff --quiet -w
8517 stash: suggest the correct command line for unknown options.
8520 Remove extra '-' from git-am(1)
8523 fast-import: start using struct pack_idx_entry
8524 fast-import: use sha1write() for pack data
8525 fast-import: use write_idx_file() instead of custom code
8526 fast-import: make default pack size unlimited
8527 fast-import: honor pack.indexversion and pack.packsizelimit config vars
8528 fast-import: use the diff_delta() max_delta_size argument
8529 sha1_file: don't malloc the whole compressed result when writing out objects
8530 sha1_file: be paranoid when creating loose objects
8533 utf8.c: remove print_wrapped_text()
8534 utf8.c: remove print_spaces()
8535 utf8.c: remove strbuf_write()
8536 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
8538 Shawn O. Pearce (7):
8539 run-command: Allow stderr to be a caller supplied pipe
8540 send-pack: demultiplex a sideband stream with status data
8541 receive-pack: Refactor how capabilities are shown to the client
8542 receive-pack: Wrap status reports inside side-band-64k
8543 receive-pack: Send hook output over side band #2
8544 t5401: Use a bare repository for the remote peer
8545 receive-pack: Send internal errors over side-band #2
8548 t7406: Fix submodule init config tests
8551 gitweb multiple project roots documentation
8554 transport: add got_remote_refs flag
8557 cherry_pick_list: quit early if one side is empty
8560 Version v1.7.0.1; changes since v1.7.0:
8561 ---------------------------------------
8564 Documentation: mention conflict marker size argument (%L) for merge driver
8565 rerere: fix memory leak if rerere images can't be read
8568 git-p4: fix bug in symlink handling
8571 Documentation: Fix indentation problem in git-commit(1)
8574 accept "git grep -- pattern"
8575 cherry-pick: rewrap advice message
8576 cherry-pick: refactor commit parsing code
8577 cherry-pick: format help message as strbuf
8578 cherry-pick: show commit name instead of sha1
8579 cherry-pick: prettify the advice message
8580 dwim_ref: fix dangling symref warning
8581 docs: don't talk about $GIT_DIR/refs/ everywhere
8582 rm: fix bug in recursive subdirectory removal
8585 t3301-notes: insert a shbang line in ./fake_editor.sh
8587 Jonathan Nieder (1):
8588 am: remove rebase-apply directory before gc
8591 Typofixes outside documentation area
8592 Start 1.7.0 maintenance track
8593 Fix use of mutex in threaded grep
8594 Prepare 1.7.0.1 release notes
8595 Update 1.7.0.1 release notes
8599 diff: make sure --output=/bad/path is caught
8602 grep documentation: clarify what files match
8603 Remove reference to GREP_COLORS from documentation
8605 Markus Heidelberg (1):
8606 sha1_name: fix segfault caused by invalid index access
8609 commit: quote the user name in the example
8612 Remove hyphen from "git-command" in two error messages
8615 fix minor memory leak in get_tree_entry()
8618 Documentation: describe --thin more accurately
8621 stash pop: remove 'apply' options during 'drop' invocation
8622 t1450: fix testcases that were wrongly expecting failure
8625 Version v1.7.0; changes since v1.7.0-rc2:
8626 -----------------------------------------
8628 Brian Gernhardt (1):
8629 t3902: Protect against OS X normalization
8632 filter-branch: Fix error message for --prune-empty --commit-filter
8635 blame: prevent a segv when -L given start > EOF
8638 am: switch --resolved to --continue
8640 Junio C Hamano (11):
8641 git-add documentation: Fix shell quoting example
8642 Fix parsing of imap.preformattedHTML and imap.sslverify
8643 git-push: document all the status flags used in the output
8644 check-ref-format documentation: fix enumeration mark-up
8645 t8003: check exit code of command and error message separately
8647 Update draft release notes to 1.7.0 one more time
8648 archive documentation: attributes are taken from the tree by default
8649 Re-fix check-ref-format documentation mark-up
8650 Fix typo in 1.6.6.2 release notes
8653 Michael J Gruber (1):
8654 Documentation: minor fixes to RelNotes-1.7.0
8657 Revert "pack-objects: fix pack generation when using pack_size_limit"
8660 bash: support 'git am's new '--continue' option
8663 Documentation: quote braces in {upstream} notation
8666 Version v1.7.0-rc2; changes since v1.7.0-rc1:
8667 ---------------------------------------------
8670 git-svn: persistent memoization
8673 configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
8674 configure: Allow --without-python
8676 Björn Gustavsson (1):
8677 bash: support the --autosquash option for rebase
8679 Brian Gernhardt (2):
8680 t9501: Skip testing load if we can't detect it
8681 t9501: Re-fix max load test
8683 Christian Stimming (1):
8684 git-gui: Update German translation (12 new or changed strings).
8687 Make NO_PTHREADS the sole thread configuration variable
8689 Emmanuel Trillaud (1):
8690 git-gui: update french translation
8692 Giuseppe Bilotta (4):
8693 git-gui: handle non-standard worktree locations
8694 git-gui: handle bare repos correctly
8695 git-gui: update shortcut tools to use _gitworktree
8696 git-gui: set GIT_DIR and GIT_WORK_TREE after setup
8699 git-gui: fix shortcut for menu "Commit/Revert Changes"
8702 gitweb: Make running t9501 test with '--debug' reliable and usable
8705 git-gui: Support applying a range of changes at once
8708 mention new shell execution behavior in release notes
8709 docs: fix filter-branch example for quoted paths
8710 Fix invalid read in quote_c_style_counted
8713 git-gui: Use git diff --submodule when available
8714 git-gui: Add a special diff popup menu for submodules
8715 git-gui: Quote git path when starting another gui in a submodule
8716 Fix memory leak in submodule.c
8717 Updates for dirty submodules in release notes and user manual
8719 John 'Warthog9' Hawley (7):
8720 gitweb: Load checking
8721 gitweb: Makefile improvements
8722 gitweb: Check that $site_header etc. are defined before using them
8723 gitweb: add a "string" variant of print_local_time
8724 gitweb: add a "string" variant of print_sort_th
8725 gitweb: Add optional extra parameter to die_error, for extended explanation
8726 gitweb: Simplify (and fix) chop_str
8729 RPM packaging: use %global inside %{!?...}
8730 Update draft release notes to 1.7.0
8731 build: make code "-Wpointer-arith" clean
8732 fast-import.c: Fix big-file-threshold parsing bug
8733 fast-import: count --max-pack-size in bytes
8734 Revert 30816237 and 7e62265
8735 Update draft release notes to 1.7.0
8737 Michael J Gruber (1):
8738 git-clean: fix the description of the default behavior
8741 filter-branch: Fix to allow replacing submodules with another content
8742 filter-branch: Add tests for submodules in tree-filter
8744 Michele Ballabio (1):
8745 git-gui: update Italian translation
8747 Nanako Shiraishi (1):
8748 git-gui: update Japanese translation
8751 fix multiple issues with t5300
8752 pack-objects: fix pack generation when using pack_size_limit
8753 make --max-pack-size argument to 'git pack-object' count in bytes
8754 update git-repack documentation wrt repack.UseDeltaBaseOffset
8756 Pal-Kristian Engstad (1):
8757 git-p4: Fix sync errors due to new server version
8760 git-gui: use themed tk widgets with Tk 8.5
8763 gitk: Fix copyright symbol in About box message
8766 git-gui: Update Swedish translation (520t0f0u)
8768 Peter Oberndorfer (1):
8769 git-gui: use different icon for new and modified files in the index
8771 Ralf Wildenhues (1):
8772 Fix typos in technical documentation.
8775 grep: simplify assignment of ->fixed
8776 archive: simplify archive format guessing
8778 Shawn O. Pearce (4):
8779 git-gui: Remove unused icon file_parttick
8780 git-gui: Update translation template
8781 fast-import: Stream very large blobs directly to pack
8782 Correct spelling of 'REUC' extension
8784 Wesley J. Landaker (1):
8785 Update git fsck --full short description to mention packs
8788 Version v1.7.0-rc1; changes since v1.7.0-rc0:
8789 ---------------------------------------------
8791 Alejandro Riveira Fernández (1):
8792 Add test-run-command to .gitignore
8794 Benjamin Kramer (1):
8795 grep: use REG_STARTEND (if available) to speed up regexec
8797 Christian Couder (1):
8798 gitk: Add "--no-replace-objects" option
8800 Christian Stimming (1):
8801 gitk: Update German translation
8804 grep: Fix two memory leaks
8807 gitk: Enable gitk to create tags with messages
8808 gitk: Fix display of newly-created tags
8810 Emmanuel Trillaud (1):
8811 gitk: Add French translation
8813 Fredrik Kuivinen (1):
8817 git-cvsserver: allow regex metacharacters in CVSROOT
8819 Ilari Liusvaara (7):
8820 Support addresses with ':' in git-daemon
8821 Allow use of []-wrapped addresses in git://
8823 Fix integer overflow in patch_delta()
8824 Fix integer overflow in unpack_sha1_rest()
8825 Fix integer overflow in unpack_compressed_entry()
8826 Fix remote.<remote>.vcs
8829 t0101: use absolute date
8830 rerere: fix too-short initialization
8831 test combinations of @{} syntax
8832 fix parsing of @{-1}@{u} combination
8833 reject @{-1} not at beginning of object name
8834 fix memcpy of overlapping area
8835 fix off-by-one allocation error
8836 add shebang line to git-mergetool--lib.sh
8839 git diff: Don't test submodule dirtiness with --ignore-submodules
8840 Teach diff --submodule that modified submodule directory is dirty
8843 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
8846 git_connect: use use_shell instead of explicit "sh", "-c"
8847 Implement pthread_cond_broadcast on Windows
8849 Junio C Hamano (13):
8850 Make ce_uptodate() trustworthy again
8851 grep: expose "status-only" feature via -q
8852 Fix log -g this@{upstream}
8853 approxidate_careful() reports errorneous date string
8854 work around an obnoxious bash "safety feature" on OpenBSD
8855 Update @{bogus.timestamp} fix not to die()
8856 t0101: use a fixed timestamp when searching in the reflog
8857 transport_get(): drop unnecessary check for !remote
8858 tests: update tests that used to fail
8859 grep --quiet: finishing touches
8860 Update draft release notes to 1.7.0
8861 RPM packaging: don't include foreign-scm-helper bits yet
8862 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
8865 gitk: Display submodule diffs with appropriate encoding
8868 gitk: Add Hungarian translation
8870 Markus Heidelberg (2):
8871 gitk: Adjust two equal strings which differed in whitespace
8872 rebase: don't invoke the pager for each commit summary
8874 Michele Ballabio (1):
8875 gitk: update Italian translation
8878 gitk: Update Hungarian translation
8881 gitk: Update Swedish translation
8884 bash: don't offer remote transport helpers as subcommands
8885 bash: support 'git notes' and its subcommands
8887 Sebastian Schuberth (1):
8888 If deriving SVN_SSH from GIT_SSH on msys, also add quotes
8891 rebase: replace antiquated sed invocation
8892 commit-tree: remove unused #define
8893 tests: consolidate CR removal/addition functions
8894 t0022: replace non-portable literal CR
8895 am: fix patch format detection for Thunderbird "Save As" emails
8896 fix portability issues with $ in double quotes
8899 t5541-http-push: make grep expression check for one line only
8902 Version v1.7.0-rc0; changes since v1.6.6.3:
8903 -------------------------------------------
8905 Andreas Gruenbacher (2):
8906 builtin-apply.c: Skip filenames without enough components
8907 builtin-apply.c: fix the --- and +++ header filename consistency check
8910 git-svn: ignore changeless commits when checking for a cherry-pick
8911 git-svn: handle merge-base failures
8912 git-svn: update svn mergeinfo test suite
8914 Andrzej K. Haczewski (1):
8915 MSVC: Windows-native implementation for subset of Pthreads API
8918 git merge -X<option>
8919 Teach git-pull to pass -X<option> to git-merge
8920 Extend merge-subtree tests to test -Xsubtree=dir.
8922 Bart Trojanowski (1):
8923 hg-to-git: fix COMMITTER type-o
8926 cvsimport: modernize callouts to git subcommands
8927 cvsimport: standarize open() calls to external git tools
8928 cvsimport: standarize system() calls to external git tools
8931 Test update-index for a gitlink to a .git file
8932 Handle relative paths in submodule .git files
8934 Christian Couder (8):
8935 reset: improve mixed reset error message when in a bare repo
8936 Documentation: reset: add some tables to describe the different options
8937 reset: add a few tests for "git reset --merge"
8938 Documentation: reset: add some missing tables
8939 t7111: check that reset options work as described in the tables
8940 help: fix configured help format taking over command line one
8941 t7111: fix bad HEAD in tests with unmerged entries
8942 Documentation: rev-list: fix synopsys for --tags and and --remotes
8944 Daniel Barkalow (9):
8945 Fix memory leak in helper method for disconnect
8946 Allow programs to not depend on remotes having urls
8947 Use a function to determine whether a remote is valid
8948 Allow fetch to modify refs
8949 Add a config option for remotes to specify a foreign vcs
8950 Add support for "import" helper command
8951 Allow helper to map private ref names into normal names
8952 Allow helpers to report in "list" command that the ref is unchanged
8953 Replace parse_blob() with an explanatory comment
8956 t7800-difftool: Set a bogus tool for use by tests
8957 git-difftool: Add '--gui' for selecting a GUI tool
8958 difftool--helper: Update copyright and remove distracting comments
8959 difftool--helper: Remove use of the GIT_MERGE_TOOL variable
8960 difftool: Allow specifying unconfigured commands with --extcmd
8961 git-diff.txt: Link to git-difftool
8962 t7800-difftool.sh: Simplify the --extcmd test
8963 difftool: Add '-x' and as an alias for '--extcmd'
8964 difftool: Use eval to expand '--extcmd' expressions
8965 difftool: Update copyright notices to list each year separately
8966 t7800-difftool.sh: Test mergetool.prompt fallback
8969 daemon: consider only address in kill_some_child()
8970 Windows: disable Python
8972 Felipe Contreras (1):
8973 General --quiet improvements
8976 No diff -b/-w output for all-whitespace changes
8978 Horst H. von Brand (1):
8979 git-rebase.txt: Fix spelling
8982 git-svn: fix mismatched src/dst errors for branch/tag
8983 git-svn: respect commiturl option for branch/tag
8984 git-svn: add --username/commit-url options for branch/tag
8985 git-svn: document --username/commit-url for branch/tag
8987 Ilari Liusvaara (15):
8988 Add remote helper debug mode
8989 Support mandatory capabilities
8990 Pass unknown protocols to external protocol handlers
8991 Refactor git transport options parsing
8992 Support taking over transports
8993 Support remote helpers implementing smart transports
8994 Support remote archive from all smart transports
8995 Remove special casing of http, https and ftp
8996 Reset possible helper before reusing remote structure
8997 Improve error message when a transport helper was not found
8998 Add push --set-upstream
8999 Add git remote set-url
9000 Add branch --set-upstream
9002 rev-parse --branches/--tags/--remotes=pattern
9005 gitweb.js: Workaround for IE8 bug
9007 James P. Howard, II (1):
9008 commit: support commit.status, --status, and --no-status
9011 builtin-push: add --delete as syntactic sugar for :foo
9014 git-svn: allow UUID to be manually remapped via rewriteUUID
9015 git-svn: allow subset of branches/tags to be specified in glob spec
9018 status: typo fix in usage
9019 status: refactor short-mode printing to its own function
9020 status: refactor format option parsing
9021 status: add --porcelain output format
9022 commit: support alternate status formats
9023 docs: note that status configuration affects only long format
9024 tests: rename duplicate t1009
9025 status: disable color for porcelain format
9026 status: reduce duplicated setup code
9027 tests: handle NO_PYTHON setting
9028 run-command: add "use shell" option
9029 run-command: convert simple callsites to use_shell
9030 run-command: optimize out useless shell calls
9031 editor: use run_command's shell feature
9032 textconv: use shell to run helper
9033 diff: run external diff helper with shell
9034 strbuf_expand: convert "%%" to "%"
9035 strbuf: add strbuf_addbuf_percentquote
9036 commit: show interesting ident information in summary
9037 commit: allow suppression of implicit identity advice
9040 Show submodules as modified when they contain a dirty work tree
9041 git status: Show uncommitted submodule changes too when enabled
9042 Performance optimization for detection of modified submodules
9045 diff.c: fix typoes in comments
9048 Basic build infrastructure for Python scripts
9049 fast-import: Proper notes tree manipulation
9050 Rename t9301 to t9350, to make room for more fast-import tests
9051 Add more testcases to test fast-import of notes
9053 Johannes Schindelin (2):
9054 Allow specifying the remote helper in the url
9055 Introduce <branch>@{upstream} notation
9058 Make test case number unique
9059 filter-branch: remove an unnecessary use of 'git read-tree'
9060 t0021: use $SHELL_PATH for the filter script
9061 t4030, t4031: work around bogus MSYS bash path conversion
9062 start_command: report child process setup errors to the parent's stderr
9063 run-command: move wait_or_whine earlier
9064 start_command: detect execvp failures early
9065 Windows: boost startup by avoiding a static dependency on shell32.dll
9066 Windows: simplify the pipe(2) implementation
9067 Windows: avoid the "dup dance" when spawning a child process
9068 Do not use date.c:tm_to_time_t() from compat/mingw.c
9069 Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
9070 Make test case numbers unique
9071 Make 'rerere forget' work from a subdirectory.
9072 merge-tree: remove unnecessary call of git_extract_argv0_path
9073 Make test numbers unique
9075 Jonathan Nieder (15):
9076 Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS
9077 Makefile: regenerate assembler listings when asked
9078 Makefile: use target-specific variable to pass flags to cc
9079 Makefile: learn to generate listings for targets requiring special flags
9080 Makefile: consolidate .FORCE-* targets
9081 Documentation: git gc packs refs by default now
9082 Documentation: tiny git config manual tweaks
9083 Documentation: merge: move configuration section to end
9084 Documentation: suggest `reset --merge` in How Merge Works section
9085 Documentation: merge: move merge strategy list to end
9086 Documentation: merge: add an overview
9087 Documentation: emphasize when git merge terminates early
9088 Documentation: merge: add a section about fast-forward
9089 Documentation: simplify How Merge Works
9090 Documentation: merge: use MERGE_HEAD to refer to the remote branch
9092 Junio C Hamano (96):
9093 Refuse updating the current branch in a non-bare repository via push
9094 Refuse deleting the current branch via push
9095 diff: change semantics of "ignore whitespace" options
9096 diff: Rename QUIET internal option to QUICK
9097 git stat: the beginning of "status that is not a dry-run of commit"
9098 git stat -s: short status output
9099 git status: not "commit --dry-run" anymore
9100 send-email: make --no-chain-reply-to the default
9101 "checkout A...B" switches to the merge base between A and B
9102 "rebase --onto A...B" replays history on the merge base between A and B
9103 git-merge-file --ours, --theirs
9104 Teach --[no-]rerere-autoupdate option to merge, revert and friends
9105 commit/status: check $GIT_DIR/MERGE_HEAD only once
9106 commit/status: "git add <path>" is not necessarily how to resolve
9107 status/commit: do not suggest "reset HEAD <path>" while merging
9108 builtin-merge.c: use standard active_cache macros
9109 resolve-undo: record resolved conflicts in a new index extension section
9110 resolve-undo: basic tests
9111 resolve-undo: allow plumbing to clear the information
9112 resolve-undo: "checkout -m path" uses resolve-undo information
9113 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
9114 rerere: remove silly 1024-byte line limit
9115 Kick off 1.7.0 cycle
9117 branch -d: base the "already-merged" safety on the branch it merges with
9118 "reset --merge": fix unmerged case
9119 tests: move convenience regexp to match object names to test-lib.sh
9120 more D/F conflict tests
9121 traverse_trees(): handle D/F conflict case sanely
9122 Aggressive three-way merge: fix D/F case
9123 Fix bit assignment for CE_CONFLICTED
9124 .gitattributes: detect 8-space indent in shell scripts
9125 unpack-trees.c: prepare for looking ahead in the index
9126 unpack-trees.c: look ahead in the index
9127 read-tree --debug-unpack
9128 Describe second batch for 1.7.0 in draft release notes
9129 ident.c: remove unused variables
9130 t3001: test ls-files -o ignored/dir
9131 read_directory_recursive(): refactor handling of a single path into a separate function
9132 read_directory(): further split treat_path()
9133 ls-files: fix overeager pathspec optimization
9134 ident.c: check explicit identity for name and email separately
9135 ident.c: treat $EMAIL as giving user.email identity explicitly
9136 rerere: refactor rerere logic to make it independent from I/O
9137 rerere forget path: forget recorded resolution
9138 bisect.c: mark file-local function static
9139 builtin-rev-list.c: mark file-local function static
9140 pretty.c: mark file-local function static
9141 grep: optimize built-in grep by skipping lines that do not hit
9142 http.c: mark file-local functions static
9143 entry.c: mark file-local function static
9144 parse-options.c: mark file-local function static
9145 read-cache.c: mark file-local functions static
9146 remote-curl.c: mark file-local function static
9147 quote.c: mark file-local function static
9148 submodule.c: mark file-local function static
9149 utf8.c: mark file-local function static
9150 mailmap.c: remove unused function
9151 sha1_file.c: remove unused function
9152 strbuf.c: remove unused function
9153 grep: rip out support for external grep
9154 grep: rip out pessimization to use fixmatch()
9155 t7502: test commit.status, --status and --no-status
9156 strbuf_addbuf(): allow passing the same buf to dst and src
9157 grep: prepare to run outside of a work tree
9158 grep --no-index: allow use of "git grep" outside a git repository
9159 Teach diff that modified submodule directory is dirty
9160 git_attr(): fix function signature
9161 xdl_merge(): introduce xmparam_t for merge specific parameters
9162 xdl_merge(): allow passing down marker_size in xmparam_t
9163 merge-tree: use ll_merge() not xdl_merge()
9164 rerere: use ll_merge() instead of using xdl_merge()
9165 conflict-marker-size: new attribute
9166 commit.c::print_summary: do not release the format string too early
9167 rerere: prepare for customizable conflict marker length
9168 rerere: honor conflict-marker-size attribute
9169 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
9170 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
9171 Update COPYING with GPLv2 with new FSF address
9172 Update draft release notes to 1.7.0
9173 pull: Fix parsing of -X<option>
9174 Make "subtree" part more orthogonal to the rest of merge-recursive.
9175 Document that merge strategies can now take their own options
9176 object.c: remove unused functions
9177 symlinks.c: remove unused functions
9178 Update draft release notes to 1.7.0
9179 Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
9180 t1506: more test for @{upstream} syntax
9181 Teach @{upstream} syntax to strbuf_branchanme()
9182 date.c: mark file-local function static
9183 Update draft release notes to 1.7.0
9184 conflict-marker-size: add test and docs
9185 git-mv: fix moving more than one source to a single destination
9186 Update draft release notes to 1.7.0
9187 rebase -i: Export GIT_AUTHOR_* variables explicitly
9188 pull: re-fix command line generation
9190 Linus Torvalds (11):
9191 Remove diff machinery dependency from read-cache
9192 slim down "git show-index"
9193 make "git merge-tree" a built-in
9194 make "git hash-object" a built-in
9195 make "git var" a built-in
9196 make "git patch-id" a built-in
9197 make "merge-index" a built-in
9198 make "mktag" a built-in
9199 make "git unpack-file" a built-in
9200 make "git pack-redundant" a built-in
9201 make "index-pack" a built-in
9204 Add an option for using any HTTP authentication scheme, not only basic
9205 Allow curl to rewind the RPC read buffer
9207 Matthew Ogilvie (3):
9208 build dashless "bin-wrappers" directory similar to installed bindir
9209 run test suite without dashed git-commands in PATH
9210 INSTALL: document a simpler way to run uninstalled builds
9213 Detailed diagnosis when parsing an object name fails.
9214 builtin-config: add --path option doing ~ and ~user expansion.
9215 push: spell 'Note about fast-forwards' section name correctly in error message.
9216 Be more user-friendly when refusing to do something because of conflict.
9217 lockfile: show absolute filename in unable_to_lock_message
9218 branch: warn and refuse to set a branch as a tracking branch of itself.
9220 Michael Haggerty (25):
9221 t3404: Use test_commit to set up test repository
9222 Add a command "fixup" to rebase --interactive
9223 lib-rebase: Provide clearer debugging info about what the editor did
9224 lib-rebase: Allow comments and blank lines to be added to the rebase script
9225 rebase-i: Ignore comments and blank lines in peek_next_command
9226 rebase -i: Make the condition for an "if" more transparent
9227 rebase -i: Remove dead code
9228 rebase -i: Inline expression
9229 rebase -i: Use "test -n" instead of "test ! -z"
9230 rebase -i: Use symbolic constant $MSG consistently
9231 rebase -i: Document how temporary files are used
9232 rebase -i: Introduce a constant AUTHOR_SCRIPT
9233 rebase -i: Introduce a constant AMEND
9234 t3404: Test the commit count in commit messages generated by "rebase -i"
9235 rebase -i: Improve consistency of commit count in generated commit messages
9236 rebase -i: Simplify commit counting for generated commit messages
9237 rebase -i: Extract a function "commit_message"
9238 rebase -i: Handle the author script all in one place in do_next
9239 rebase -i: Extract function do_with_author
9240 rebase -i: Change function make_squash_message into update_squash_message
9241 rebase -i: For fixup commands without squashes, do not start editor
9242 t3404: Set up more of the test repo in the "setup" step
9243 rebase -i: Retain user-edited commit messages after squash/fixup conflicts
9244 rebase -i: Avoid non-portable "test X -a Y"
9245 rebase -i: Enclose sed command substitution in quotes
9247 Michael J Gruber (7):
9248 status -s: respect the status.relativePaths option
9249 t7508-status.sh: Add tests for status -s
9250 builtin-commit: refactor short-status code into wt-status.c
9251 status -s: obey color.status
9252 t7508-status: status --porcelain ignores relative paths setting
9253 t7508-status: test all modes with color
9254 tag -d: print sha1 of deleted tag
9256 Michael Lukashov (1):
9257 Windows: Remove dependency on pthreadGC2.dll
9260 builtin-commit: add --date option
9261 Document date formats accepted by parse_date()
9263 Nanako Shiraishi (3):
9264 rebase -i --autosquash: auto-squash commits
9265 rebase: fix --onto A...B parsing and add tests
9266 rebase -i: teach --onto A...B syntax
9268 Nguyễn Thái Ngọc Duy (27):
9269 update-index: refactor mark_valid() in preparation for new options
9270 Add test-index-version
9271 Introduce "skip-worktree" bit in index, teach Git to get/set this bit
9272 Teach Git to respect skip-worktree bit (reading part)
9273 Teach Git to respect skip-worktree bit (writing part)
9274 Avoid writing to buffer in add_excludes_from_file_1()
9275 Read .gitignore from index if it is skip-worktree
9276 unpack-trees(): carry skip-worktree bit over in merged_entry()
9277 excluded_1(): support exclude files in index
9278 dir.c: export excluded_1() and add_excludes_from_file_1()
9279 Introduce "sparse checkout"
9280 unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
9281 unpack-trees.c: generalize verify_* functions
9282 unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
9283 unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
9284 unpack-trees(): ignore worktree check outside checkout area
9285 read-tree: add --no-sparse-checkout to disable sparse checkout support
9286 Add tests for sparse checkout
9287 sparse checkout: inhibit empty worktree
9288 ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
9289 commit: correctly respect skip-worktree bit
9290 grep: do not do external grep on skip-worktree entries
9291 t7002: set test prerequisite "external-grep" if supported
9292 t7002: test for not using external grep on skip-worktree paths
9293 status: only touch path we may need to check
9294 rm: only refresh entries that we may touch
9295 Fix memory corruption when .gitignore does not end by \n
9298 fix git-p4 editor invocation
9300 Peter Collingbourne (1):
9301 Remove empty directories when checking out a commit with fewer submodules
9304 CVS Server: Support reading base and roots from environment
9306 Ramkumar Ramachandra (1):
9307 Documentation: Update git core tutorial clarifying reference to scripts
9309 Ramsay Allan Jones (5):
9310 MSVC: Fix an "incompatible pointer types" compiler warning
9311 engine.pl: Fix a recent breakage of the buildsystem generator
9312 msvc: Fix an "unrecognized option" linker warning
9313 msvc: Fix a compiler warning due to an incorrect pointer cast
9314 msvc: Add a definition of NORETURN compatible with msvc compiler
9317 Add completion for git-svn mkdirs,reset,and gc
9319 Sebastian Schuberth (1):
9320 Make difftool.prompt fall back to mergetool.prompt
9323 cvsserver: make the output of 'update' more compatible with cvs.
9325 Shawn O. Pearce (1):
9326 bash completion: add space between branch name and status flags
9329 reset: use "unpack_trees()" directly instead of "git read-tree"
9332 Add 'git rev-parse --show-toplevel' option.
9333 Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
9335 Sverre Rabbelier (9):
9336 Fix various memory leaks in transport-helper.c
9337 Add Python support library for remote helpers
9338 fast-import: put option parsing code in separate functions
9339 fast-import: put marks reading in its own function
9340 fast-import: add feature command
9341 fast-import: add option command
9342 fast-import: test the new option command
9343 fast-import: allow for multiple --import-marks= arguments
9344 fast-import: add (non-)relative-marks feature
9346 Tarmigan Casebolt (7):
9347 t/lib-http.sh: Restructure finding of default httpd location
9348 Smart-http: check if repository is OK to export before serving it
9349 Smart-http tests: Improve coverage in test t5560
9350 Smart-http tests: Break test t5560-http-backend into pieces
9351 Smart-http tests: Test http-backend without curl or a webserver
9352 Test t5560: Fix test when run with dash
9353 ident.c: replace fprintf with fputs to suppress compiler warning
9356 http: maintain curl sessions
9357 builtin-push: don't access freed transport->url
9358 check stderr with isatty() instead of stdout when deciding to show progress
9359 git-clone.txt: reword description of progress behaviour
9360 clone: set transport->verbose when -v/--verbose is used
9361 clone: use --progress to force progress reporting
9362 t5541-http-push.sh: add tests for non-fast-forward pushes
9363 t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
9364 refactor ref status logic for pushing
9365 transport.c::transport_push(): make ref status affect return value
9366 transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
9367 transport-helper.c::push_refs(): emit "no refs" error message
9370 Use warning function instead of fprintf(stderr, "Warning: ...").
9371 string-list: rename the include guard to STRING_LIST_H
9374 Documentation/git-merge: reword references to "remote" and "pull"
9375 Documentation: warn prominently against merging with dirty trees
9376 Documentation: format full commands in typewriter font
9377 Documentation: spell 'git cmd' without dash throughout
9378 Documentation: show-files is now called git-ls-files
9379 Documentation: emphasise 'git shortlog' in its synopsis
9380 Documentation: improve description of --glob=pattern and friends
9381 Documentation: add missing :: in config.txt
9382 Documentation: move away misplaced 'push --upstream' description
9385 Version v1.6.6.3; changes since v1.6.6.2:
9386 -----------------------------------------
9388 Christian Couder (1):
9389 bisect: error out when passing bad path parameters
9392 run-command: support custom fd-set in async
9395 require_work_tree broken with NONGIT_OK
9398 Check size of path buffer before writing into it
9401 git-imap-send: Convert LF to CRLF before storing patch to draft box
9404 filter-branch: Fix error message for --prune-empty --commit-filter
9407 gitweb: Introduce esc_attr to escape attributes of HTML elements
9410 dwim_ref: fix dangling symref warning
9411 rm: fix bug in recursive subdirectory removal
9414 t3301-notes: insert a shbang line in ./fake_editor.sh
9415 MSVC: Fix build by adding missing termios.h dummy
9418 t6000lib: Fix permission
9419 lib-patch-mode.sh: Fix permission
9420 Re-fix check-ref-format documentation mark-up
9421 Fix typo in 1.6.6.2 release notes
9425 diff: make sure --output=/bad/path is caught
9427 Michael J Gruber (4):
9428 Documentation/git-reflog: Fix formatting of command lists
9429 Documentation/gitdiffcore: Remove misleading date in heading
9430 Documentation/urls: Remove spurious example markers
9431 Documentation/git-clone: Transform description list into item list
9434 Remove extra '-' from git-am(1)
9437 Remove hyphen from "git-command" in two error messages
9440 fix minor memory leak in get_tree_entry()
9441 utf8.c: remove print_wrapped_text()
9442 utf8.c: remove print_spaces()
9443 utf8.c: remove strbuf_write()
9444 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
9446 Shawn O. Pearce (7):
9447 run-command: Allow stderr to be a caller supplied pipe
9448 send-pack: demultiplex a sideband stream with status data
9449 receive-pack: Refactor how capabilities are shown to the client
9450 receive-pack: Wrap status reports inside side-band-64k
9451 receive-pack: Send hook output over side band #2
9452 t5401: Use a bare repository for the remote peer
9453 receive-pack: Send internal errors over side-band #2
9456 request-pull.txt: Document -p option
9459 stash pop: remove 'apply' options during 'drop' invocation
9460 cherry_pick_list: quit early if one side is empty
9462 Uwe Kleine-König (1):
9463 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
9466 Version v1.6.6.2; changes since v1.6.6.1:
9467 -----------------------------------------
9469 Christopher Beelby (1):
9470 git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
9473 git-cvsserver: allow regex metacharacters in CVSROOT
9475 Giuseppe Bilotta (1):
9476 git-gui: work from the .git dir
9478 Ilari Liusvaara (4):
9480 Fix integer overflow in patch_delta()
9481 Fix integer overflow in unpack_sha1_rest()
9482 Fix integer overflow in unpack_compressed_entry()
9485 blame: prevent a segv when -L given start > EOF
9488 git-gui: Fix applying a line when all following lines are deletions
9491 fix memcpy of overlapping area
9494 git-gui: Correct file_states when unstaging partly staged entry
9497 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
9499 Jonathan Nieder (1):
9500 git-gui: Makefile: consolidate .FORCE-* targets
9502 Junio C Hamano (15):
9503 checkout -m path: fix recreating conflicts
9504 status: don't require the repository to be writable
9505 Fix "log" family not to be too agressive about showing notes
9506 Fix "log --oneline" not to show notes
9507 merge-recursive: do not return NULL only to cause segfault
9508 ignore duplicated slashes in make_relative_path()
9509 approxidate_careful() reports errorneous date string
9510 Update @{bogus.timestamp} fix not to die()
9511 t0101: use a fixed timestamp when searching in the reflog
9512 git-add documentation: Fix shell quoting example
9513 Fix parsing of imap.preformattedHTML and imap.sslverify
9514 git-push: document all the status flags used in the output
9515 check-ref-format documentation: fix enumeration mark-up
9516 t8003: check exit code of command and error message separately
9519 Nguyễn Thái Ngọc Duy (1):
9520 Add missing #include to support TIOCGWINSZ on Solaris
9523 git-gui: handle really long error messages in updateindex.
9526 git-gui: Fix gitk for branch whose name matches local file
9529 archive: complain about path specs that don't match anything
9530 archive: simplify archive format guessing
9533 bash: don't offer remote transport helpers as subcommands
9535 Shawn O. Pearce (1):
9536 fast-import: Stream very large blobs directly to pack
9539 retry request without query when info/refs?query fails
9541 Vitaly "_Vi" Shukela (1):
9542 git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
9544 Wesley J. Landaker (1):
9545 Update git fsck --full short description to mention packs
9548 Version v1.6.6.1; changes since v1.6.6:
9549 ---------------------------------------
9551 Andreas Gruenbacher (3):
9552 base85 debug code: Fix length byte calculation
9553 base85: encode_85() does not use the decode table
9554 base85: Make the code more obvious instead of explaining the non-obvious
9557 git count-objects: handle packs bigger than 4G
9559 Björn Gustavsson (4):
9560 Documentation: 'git add -A' can remove files
9561 git-add/rm doc: Consistently back-quote
9562 Fix "git remote update" with remotes.defalt set
9563 git-rm doc: Describe how to sync index & work tree
9566 bisect: fix singular/plural grammar nit
9569 fast-import: tag may point to any object type
9572 commit: --cleanup is a message option
9575 reset: unbreak hard resets with GIT_WORK_TREE
9576 textconv: stop leaking file descriptors
9579 grep: NUL terminate input from a file
9581 Jonathan Nieder (2):
9582 Documentation: git gc packs refs by default now
9583 Documentation: tiny git config manual tweaks
9585 Junio C Hamano (10):
9586 t1200: work around a bug in some implementations of "find"
9587 t4019 "grep" portability fix
9588 Start 1.6.6.X maintenance track
9589 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
9590 checkout -m: do not try to fall back to --merge from an unborn branch
9591 grep: -L should show empty files
9592 Update draft release notes to 1.6.6.1
9593 Fix mis-backport of t7002
9598 SubmittingPatches: hints to know the status of a submitted patch.
9599 branch: die explicitly why when calling "git branch [-a|-r] branchname".
9600 stash: mention --patch in usage string.
9602 Michael Haggerty (1):
9603 rebase--interactive: Ignore comments and blank lines in peek_next_command
9605 Nathaniel W Filardo (1):
9606 read_index(): fix reading extension size on BE 64-bit archs
9608 Nguyễn Thái Ngọc Duy (2):
9609 Documentation: always respect core.worktree if set
9610 t7102: make the test fail if one of its check fails
9612 Ramkumar Ramachandra (1):
9613 Document git-blame triple -C option
9615 Richard Weinberger (1):
9616 Fix uninitialized variable in get_refs_via_rsync().
9618 Shawn O. Pearce (2):
9619 fast-import: Document author/committer/tagger name is optional
9620 remote-curl: Fix Accept header for smart HTTP connections
9623 octopus: make merge process simpler to follow
9624 octopus: reenable fast-forward merges
9625 octopus: remove dead code
9627 Tarmigan Casebolt (1):
9628 Add git-http-backend to command-list.
9631 bash completion: factor submodules into dirty state
9634 Version v1.6.6; changes since v1.6.6-rc4:
9635 -----------------------------------------
9638 git-svn: Remove obsolete MAXPARENT check
9641 Prevent git blame from segfaulting on a missing author name
9644 git svn: fix --revision when fetching deleted paths
9645 update release notes for git svn in 1.6.6
9646 git svn: lookup new parents correctly from svn:mergeinfo
9647 git svn: branch/tag commands detect username in URLs
9653 git svn: add test for a git svn gc followed by a git svn mkdirs
9656 git-svn: expand the svn mergeinfo test suite, highlighting some failures
9657 git-svn: memoize conversion of SVN merge ticket info to git commit ranges
9658 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
9659 git-svn: exclude already merged tips using one rev-list call
9660 git-svn: detect cherry-picks correctly.
9663 Version v1.6.6-rc4; changes since v1.6.6-rc3:
9664 ---------------------------------------------
9666 Björn Gustavsson (1):
9667 rebase -i: abort cleanly if the editor fails to launch
9670 git svn: make empty directory creation gc-aware
9671 t9146: use 'svn_cmd' wrapper
9677 api-strbuf.txt: fix typos and document launch_editor()
9678 technical-docs: document hash API
9681 Version v1.6.6-rc3; changes since v1.6.6-rc2:
9682 ---------------------------------------------
9684 Björn Gustavsson (1):
9685 bash: Support new 'git fetch' options
9688 ignore unknown color configuration
9691 help.autocorrect: do not run a command if the command given is junk
9694 Remove post-upload-hook
9695 Fix archive format with -- on the command line
9697 Update Release Notes for 1.6.6 to remove old bugfixes
9698 worktree: don't segfault with an absolute pathspec without a work tree
9702 Nanako Shiraishi (1):
9703 Illustrate "filter" attribute with an example
9706 Version v1.6.6-rc2; changes since v1.6.6-rc1:
9707 ---------------------------------------------
9710 git-svn: sort svk merge tickets to account for minimal parents
9711 git-svn: Set svn.authorsfile to an absolute path when cloning
9712 git-svn: set svn.authorsfile earlier when cloning
9714 Alexander Gavrilov (1):
9715 git-gui: Increase blame viewer usability on MacOS.
9718 gitk: Skip translation of "wrong Tcl version" message
9721 t4201: use ISO8859-1 rather than ISO-8859-1
9722 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
9724 Clemens Buchacher (1):
9725 git-gui: search 4 directories to improve statistic of gc hint
9728 git svn: log removals of empty directories
9731 git svn: Don't create empty directories whose parents were deleted
9733 Guillermo S. Romero (1):
9734 gitk: Add configuration for UI colour scheme
9737 git gui: make current branch default in "remote delete branch" merge check
9740 gitweb: Describe (possible) gitweb.js minification in gitweb/README
9743 pull: clarify advice for the unconfigured error case
9746 rerere: don't segfault on failure to open rr-cache
9747 reset: improve worktree safety valves
9748 add-interactive: fix deletion of non-empty files
9751 gitk: Fix diffing committed -> staged (typo in diffcmd)
9752 gitk: Use the --submodule option for displaying diffs when available
9754 Jindrich Makovicka (1):
9755 git-gui: suppress RenderBadPicture X error caused by Tk bug
9758 Fix crasher on encountering SHA1-like non-note in notes tree
9761 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
9762 Unconditionally set man.base.url.for.relative.links
9764 Documentation: xmlto 0.0.18 does not know --stringparam
9767 Revert recent "git merge <msg> HEAD <commit>..." deprecation
9768 Update draft release notes to 1.6.6 before -rc2
9772 Fix diff -B/--dirstat miscounting of newly added contents
9774 Markus Heidelberg (1):
9775 gitk: Fix "git gui blame" invocation when called from top-level directory
9778 gitk: Add Japanese translation
9779 gitk: Update Japanese translation
9782 gitk: Use themed tk widgets
9783 gitk: Fix errors in the theme patch
9784 gitk: Default to the system colours on Windows
9785 gitk: Fix selection of tags
9788 gitk: Restore scrolling position of diff pane on back/forward in history
9789 gitk: Add a user preference to enable/disable use of themed widgets
9790 gitk: Show diff of commits at end of compare-commits output
9791 gitk: Don't compare fake children when comparing commits
9792 gitk: Improve appearance of radiobuttons and checkbuttons
9795 archive: clarify description of path parameter
9798 bash: update 'git commit' completion
9800 Sitaram Chamarty (1):
9801 gitk: Disable checkout of remote branches
9804 Documentation: Avoid use of xmlto --stringparam
9807 Version v1.6.6-rc1; changes since v1.6.6-rc0:
9808 ---------------------------------------------
9811 builtin-merge.c: call exclude_cmds() correctly.
9813 Benjamin Kramer (1):
9814 Explicitly truncate bswap operand to uint32_t
9817 Give the hunk comment its own color
9818 get_ref_states: strdup entries and free util in stale list
9820 Björn Gustavsson (11):
9821 Teach the --all option to 'git fetch'
9822 Teach the --multiple option to 'git fetch'
9823 Add the configuration option skipFetchAll
9824 Add missing test for 'git remote update --prune'
9825 Re-implement 'git remote update' using 'git fetch'
9826 Clarify and correct -z
9827 apply: apply works outside a repository
9828 apply: Format all options using back-quotes
9829 apply: Use the term "working tree" consistently
9830 Fix over-simplified documentation for 'git log -z'
9831 gitworkflows: Consistently back-quote git commands
9833 Brian Gernhardt (1):
9834 t/gitweb-lib: Split HTTP response with non-GNU sed
9836 Christian Couder (6):
9837 Documentation: add "Fighting regressions with git bisect" article
9838 replace: use a GIT_NO_REPLACE_OBJECTS env variable
9839 Documentation: fix typos and spelling in replace documentation
9840 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
9841 bisect: simplify calling visualizer using '--bisect' option
9842 Documentation: update descriptions of revision options related to '--bisect'
9845 help: Do not unnecessarily look for a repository
9847 David Soria Parra (1):
9848 Documentation: Document --branch option in git clone synopsis
9851 commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
9853 Felipe Contreras (3):
9854 format-patch: fix parsing of "--" on the command line
9855 format-patch: add test for parsing of "--"
9856 send-email: automatic envelope sender
9858 Horst H. von Brand (1):
9859 git-pull.sh: Fix call to git-merge for new command format
9861 Jakub Narebski (10):
9862 gitweb: Add optional "time to generate page" info in footer
9863 gitweb: Incremental blame (using JavaScript)
9864 gitweb: Colorize 'blame_incremental' view during processing
9865 gitweb: Create links leading to 'blame_incremental' using JavaScript
9866 gitweb: Minify gitweb.js if JSMIN is defined
9867 t/gitweb-lib.sh: Split gitweb output into headers and body
9868 gitweb: Document current snapshot rules via new tests
9869 gitweb.js: Harden setting blamed commit info in incremental blame
9870 gitweb: Make linking to actions requiring JavaScript a feature
9871 gitweb: Add link to other blame implementation in blame views
9874 remote: refactor some logic into get_stale_heads()
9875 teach warn_dangling_symref to take a FILE argument
9876 builtin-fetch: add --prune option
9877 builtin-fetch: add --dry-run option
9880 prune-packed: only show progress when stderr is a tty
9883 t4014-format-patch: do not assume 'test' is available as non-builtin
9884 Add a notice that only certain functions can print color escape codes
9886 Jonathan Nieder (1):
9887 Makefile: do not clean arm directory
9889 Junio C Hamano (19):
9890 mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
9891 Pretty-format: %[+-]x to tweak inter-item newlines
9892 read_revision_from_stdin(): use strbuf
9893 Teach --stdin option to "log" family
9894 setup_revisions(): do not call get_pathspec() too early
9895 Make --stdin option to "log" family read also pathspecs
9896 t9001: test --envelope-sender option of send-email
9897 Add trivial tests for --stdin option to log family
9898 Protect scripted Porcelains from GREP_OPTIONS insanity
9899 builtin-apply.c: pay attention to -p<n> when determining the name
9900 Remove dead code from "git am"
9901 emit_line(): don't emit an empty <SET><RESET> followed by a newline
9902 Update draft release notes to 1.6.6 before merging topics for -rc1
9903 git-merge: a deprecation notice of the ancient command line syntax
9904 Update draft release notes to 1.6.6 before -rc1
9905 Do not misidentify "git merge foo HEAD" as an old-style invocation
9906 merge: do not add standard message when message is given with -m option
9911 gitweb: check given hash before trying to create snapshot
9912 gitweb: Smarter snapshot names
9915 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST
9916 Refactor winsock initialization into a separate function
9917 Enable support for IPv6 on MinGW
9919 Matthew Ogilvie (5):
9920 cvsserver doc: database generally can not be reproduced consistently
9921 config documentation: some configs are auto-set by git-init
9922 t2300: use documented technique to invoke git-sh-setup
9923 t3409 t4107 t7406 t9150: use dashless commands
9924 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH
9927 merge-recursive: point the user to commit when file would be overwritten.
9928 user-manual: Document that "git merge" doesn't like uncommited changes.
9929 merge-recursive: make the error-message generation an extern function
9930 builtin-merge: show user-friendly error messages for fast-forward too.
9932 Michael J Gruber (1):
9933 Documentation: Fix a few i.e./e.g. mix-ups
9935 Nanako Shiraishi (2):
9936 t1200: fix a timing dependent error
9937 prepare send-email for smoother change of --chain-reply-to default
9940 pack-objects: split implications of --all-progress from progress activation
9942 Ramsay Allan Jones (1):
9943 git-count-objects: Fix a disk-space under-estimate on Cygwin
9946 strbuf_add_wrapped_text(): skip over colour codes
9947 mergetool--lib: simplify guess_merge_tool()
9950 gitweb.js: fix null object exception in initials calculation
9951 instaweb: restart server if already running
9952 gitweb.js: fix padLeftStr() and its usage
9955 remote-curl.c: fix rpc_out()
9957 Uwe Kleine-König (1):
9958 shortlog: respect commit encoding
9961 Version v1.6.6-rc0; changes since v1.6.5.9:
9962 -------------------------------------------
9965 git-gui: Update russian translation
9967 Alexey Borzenkov (1):
9968 git-gui: store wm state and fix wm geometry
9971 bisect reset: Allow resetting to any commit, not just a branch
9974 configure: add macro to set arbitrary make variables
9975 configure: add settings for gitconfig, editor and pager
9977 Björn Gustavsson (10):
9978 Teach 'rebase -i' the command "reword"
9979 bash: complete more options for 'git rebase'
9980 Teach 'git merge' and 'git pull' the option --ff-only
9981 format-patch: Always generate a patch
9982 format-patch documentation: Remove diff options that are not useful
9983 format-patch documentation: Fix formatting
9984 format-patch: Add "--no-stat" as a synonym for "-p"
9985 bash: add the merge option --ff-only
9986 Fix truncated usage messages
9987 User Manual: Write "Git" instead of "GIT"
9989 Christian Couder (1):
9990 git: add --no-replace-objects option to disable replacing
9992 Clemens Buchacher (2):
9993 remote-helpers: return successfully if everything up-to-date
9994 set httpd port before sourcing lib-httpd
9997 git-gui: Limit display to a maximum number of files
10000 submodule.c: Squelch a "use before assignment" warning
10003 commit: More generous accepting of RFC-2822 footer lines.
10006 git-blame.el: Change how blame information is shown.
10009 git svn: fix fetch where glob is on the top-level URL
10010 git svn: read global+system config for clone+init
10011 git svn: add authorsfile test case for ~/.gitconfig
10012 git svn: attempt to create empty dirs on clone+rebase
10013 git svn: always reuse existing remotes on fetch
10014 git svn: strip leading path when making empty dirs
10016 Erik Faye-Lund (6):
10017 imap-send: use separate read and write fds
10018 imap-send: use run-command API for tunneling
10019 imap-send: fix compilation-error on Windows
10020 imap-send: build imap-send on Windows
10021 mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
10022 mingw: enable OpenSSL
10024 Felipe Contreras (2):
10026 Use 'fast-forward' all over the place
10029 git-gui: remove warning when deleting correctly merged remote branch
10031 Ingmar Vanhassel (1):
10032 import-tars: Add support for tarballs compressed with lzma, xz
10034 Jakub Narebski (4):
10035 gitweb: Add 'show-sizes' feature to show blob sizes in tree view
10036 gitweb: Refactor 'log' action generation, adding git_log_body()
10037 gitweb: Refactor common parts of 'log' and 'shortlog' views
10038 gitweb: Make 'history' view (re)use git_log_generic()
10041 Teach "git describe" --dirty option
10044 imap-send: remove useless uid code
10045 gitignore: root most patterns at the top-level directory
10046 t915{0,1}: use $TEST_DIRECTORY
10049 git-gui: display summary when showing diff of a submodule
10050 git-gui: fix diff for partially staged submodule changes
10051 git submodule add: make the <path> parameter optional
10052 git-gui: fix use of uninitialized variable
10053 add tests for git diff --submodule
10055 Jimmy Angelakos (1):
10056 git-gui: Added Greek translation & glossary
10059 Teach "-m <msg>" and "-F <file>" to "git notes edit"
10060 fast-import: Add support for importing commit notes
10061 t3302-notes-index-expensive: Speed up create_repo()
10062 Add flags to get_commit_notes() to control the format of the note string
10063 Teach notes code to free its internal data structures on request
10064 Teach the notes lookup code to parse notes trees with various fanout schemes
10065 Add selftests verifying that we can parse notes trees with various fanouts
10066 Refactor notes code to concatenate multiple notes annotating the same object
10067 Add selftests verifying concatenation of multiple notes for the same commit
10069 Johannes Schindelin (8):
10070 print_wrapped_text(): allow hard newlines
10071 Add strbuf_add_wrapped_text() to utf8.[ch]
10072 Introduce commit notes
10073 Add a script to edit/inspect notes
10074 Speed up git notes lookup
10075 Add an expensive test for git-notes
10076 Add '%N'-format for pretty-printing commit notes
10077 Add the --submodule option to the diff option family
10080 Windows: use BLK_SHA1 again
10082 Jonathan Nieder (34):
10083 Add tests for git check-ref-format
10084 check-ref-format: simplify --print implementation
10085 Handle more shell metacharacters in editor names
10086 Retire fetch--tool helper to contrib/examples
10087 Show usage string for 'git grep -h'
10088 Show usage string for 'git cherry -h'
10089 Show usage string for 'git commit-tree -h'
10090 Show usage string for 'git merge-ours -h'
10091 Show usage string for 'git show-ref -h'
10092 http-fetch: add missing initialization of argv0_path
10093 Show usage string for 'git check-ref-format -h'
10094 Show usage string for 'git fast-import -h'
10095 Show usage string for 'git get-tar-commit-id -h'
10096 Show usage string for 'git imap-send -h'
10097 Show usage string for 'git mailsplit -h'
10098 Show usage string for 'git merge-one-file -h'
10099 Show usage string for 'git rev-parse -h'
10100 Show usage string for 'git show-index -h'
10101 Show usage string for 'git unpack-file -h'
10102 Show usage string for 'git stripspace -h'
10103 Let 'git http-fetch -h' show usage outside any git repository
10104 Show usage string for 'git http-push -h'
10105 Let 'git <command> -h' show usage without a git dir
10106 Introduce usagef() that takes a printf-style format
10107 merge-{recursive,subtree}: use usagef() to print usage
10108 diff --no-index: make the usage string less scary
10109 Do not use VISUAL editor on dumb terminals
10110 Suppress warnings from "git var -l"
10111 Teach git var about GIT_EDITOR
10112 Teach git var about GIT_PAGER
10113 add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
10114 am -i, git-svn: use "git var GIT_PAGER"
10115 Provide a build time default-editor setting
10116 Speed up bash completion loading
10118 Julian Phillips (4):
10119 fetch: Speed up fetch by rewriting find_non_local_tags
10120 remote: Make ref_remove_duplicates faster for large numbers of refs
10121 fetch: Speed up fetch of large numbers of refs
10122 remote: fix use-after-free error detected by glibc in ref_remove_duplicates
10124 Junio C Hamano (20):
10125 diff-lib.c: fix misleading comments on oneway_diff()
10126 unpack-trees: typofix
10127 unpack_callback(): use unpack_failed() consistently
10128 git check-ref-format --print
10130 check_filename(): make verify_filename() callable without dying
10131 DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
10132 format_commit_message(): fix function signature
10133 fsck: default to "git fsck --full"
10134 git checkout --no-guess
10135 Teach --wrap to only indent without wrapping
10136 Update draft release notes to 1.6.6
10137 Revert "Don't create the $GIT_DIR/branches directory on init"
10138 t1200: further modernize test script style
10139 t1200: prepare for merging with Fast-forward bikeshedding
10140 builtin-commit.c: fix logic to omit empty line before existing footers
10141 git-describe.txt: formatting fix
10142 Provide a build time default-pager setting
10143 Update draft release notes to 1.6.6
10146 Linus Torvalds (1):
10147 Add '--bisect' revision machinery argument
10149 Marius Storm-Olsen (1):
10150 MSVC: Enable OpenSSL, and translate -lcrypto
10153 http-backend: add GIT_PROJECT_ROOT environment var
10154 http-backend: reword some documentation
10155 http-backend: use mod_alias instead of mod_rewrite
10156 http-backend: add example for gitweb on same URL
10157 http-backend: more explict LocationMatch
10160 instaweb: support mod_cgid for apache2
10162 Markus Heidelberg (1):
10163 bash completion: difftool accepts the same options as diff
10165 Michael J Gruber (1):
10166 Make t9150 and t9151 test scripts executable
10169 pack-objects: move thread autodetection closer to relevant code
10171 Ramsay Allan Jones (2):
10172 Makefile: keep MSVC and Cygwin configuration separate
10173 MSVC: Add support for building with NO_MMAP
10176 describe: load refnames before calling describe()
10177 Implement wrap format %w() as if it is a mode switch
10178 log --format: don't ignore %w() at the start of format string
10179 grep: unset GREP_OPTIONS before spawning external grep
10180 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
10181 log --format: document %w
10183 Robin Rosenberg (1):
10184 Don't create the $GIT_DIR/branches directory on init
10187 Documentation: add 'git replace' to main git manpage
10190 git-svn: add test data for SVK merge, with script.
10191 git-svn: allow test setup script to support PERL env. var
10192 git-svn: convert SVK merge tickets to extra parents
10193 git-svn: add test data for SVN 1.5+ merge, with script.
10194 git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
10197 mergetool--lib: add p4merge as a pre-configured mergetool option
10198 Update packfile transfer protocol documentation
10200 Sebastian Schuberth (2):
10201 Use faster byte swapping when compiling with MSVC
10202 Make the MSVC projects use PDB/IDB files named after the project
10204 Shawn O. Pearce (27):
10205 git-gui: Ensure submodule path is quoted properly
10206 pkt-line: Add strbuf based functions
10207 pkt-line: Make packet_read_line easier to debug
10208 fetch-pack: Use a strbuf to compose the want list
10209 Move "get_ack()" back to fetch-pack
10210 Add multi_ack_detailed capability to fetch-pack/upload-pack
10211 remote-curl: Refactor walker initialization
10212 fetch: Allow transport -v -v -v to set verbosity to 3
10213 remote-helpers: Fetch more than one ref in a batch
10214 remote-helpers: Support custom transport options
10215 Move WebDAV HTTP push under remote-curl
10216 Git-aware CGI to provide dumb HTTP transport
10217 Add stateless RPC options to upload-pack, receive-pack
10218 Smart fetch and push over HTTP: server side
10219 Discover refs via smart HTTP server when available
10220 Smart push over HTTP: client side
10221 Smart fetch over HTTP: client side
10222 Smart HTTP fetch: gzip requests
10223 http tests: use /dumb/ URL prefix
10224 test smart http fetch and push
10225 http-backend: Use http.getanyfile to disable dumb HTTP serving
10226 http-backend: Test configuration options
10227 Git-aware CGI to provide dumb HTTP transport
10228 http-backend: Protect GIT_PROJECT_ROOT from /../ requests
10229 t5551-http-fetch: Work around some libcurl versions
10230 t5551-http-fetch: Work around broken Accept header in libcurl
10231 http-backend: Fix bad treatment of uintmax_t in Content-Length
10234 rebase -i: fix reword when using a terminal editor
10235 gitweb: linkify author/committer names with search
10236 t1402: Make test executable
10237 t1200: cleanup and modernize test style
10238 t1200: Make documentation and test agree
10239 t3101: test more ls-tree options
10240 ls-tree: migrate to parse-options
10242 Tarmigan Casebolt (3):
10243 Check the format of more printf-type functions
10244 http-backend: Fix access beyond end of string.
10245 http-backend: Let gcc check the format of more printf-type functions.
10248 http-push: fix check condition on http.c::finish_http_pack_request()
10249 t5540-http-push: remove redundant fetches
10252 Documentation: update pt-BR
10255 bash completion: complete refs for git-grep
10256 Let --decorate show HEAD position
10257 Refactor pretty_print_commit arguments into a struct
10258 reflog-walk: refactor the branch@{num} formatting
10259 Introduce new pretty formats %g[sdD] for reflog information
10260 stash list: use new %g formats instead of sed
10261 stash list: drop the default limit of 10 stashes
10262 describe: when failing, tell the user about options that work
10263 filter-branch: stop special-casing $filter_subdir argument
10264 filter-branch: nearest-ancestor rewriting outside subdir filter
10265 Documentation: clarify 'ours' merge strategy
10266 rebase docs: clarify --merge and --strategy
10267 Document git-svn's first-parent rule
10268 describe: do not use unannotated tag even if exact match
10271 git svn: handle SVN merges from revisions past the tip of the branch
10274 git-gui: adjust the minimum height of diff pane for shorter screen height
10277 git-update-index.txt: Document the --really-refresh option.
10280 Version v1.6.5.9; changes since v1.6.5.8:
10281 -----------------------------------------
10283 Björn Gustavsson (3):
10284 Documentation: 'git add -A' can remove files
10285 git-add/rm doc: Consistently back-quote
10286 git-rm doc: Describe how to sync index & work tree
10289 Check size of path buffer before writing into it
10291 Jakub Narebski (1):
10292 gitweb: Introduce esc_attr to escape attributes of HTML elements
10295 blame: prevent a segv when -L given start > EOF
10298 fix memcpy of overlapping area
10299 dwim_ref: fix dangling symref warning
10301 Junio C Hamano (2):
10302 t8003: check exit code of command and error message separately
10306 diff: make sure --output=/bad/path is caught
10309 Remove extra '-' from git-am(1)
10312 octopus: make merge process simpler to follow
10313 octopus: reenable fast-forward merges
10314 octopus: remove dead code
10315 request-pull.txt: Document -p option
10318 stash pop: remove 'apply' options during 'drop' invocation
10320 Uwe Kleine-König (1):
10321 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
10324 Version v1.6.5.8; changes since v1.6.5.7:
10325 -----------------------------------------
10327 Andreas Gruenbacher (3):
10328 base85 debug code: Fix length byte calculation
10329 base85: encode_85() does not use the decode table
10330 base85: Make the code more obvious instead of explaining the non-obvious
10332 Andreas Schwab (1):
10333 git count-objects: handle packs bigger than 4G
10335 Björn Gustavsson (1):
10336 rebase -i: abort cleanly if the editor fails to launch
10339 Prevent git blame from segfaulting on a missing author name
10341 Dmitry Potapov (1):
10342 fast-import: tag may point to any object type
10345 commit: --cleanup is a message option
10348 reset: unbreak hard resets with GIT_WORK_TREE
10349 textconv: stop leaking file descriptors
10352 grep: NUL terminate input from a file
10354 Junio C Hamano (3):
10355 checkout -m: do not try to fall back to --merge from an unborn branch
10356 Fix mis-backport of t7002
10360 branch: die explicitly why when calling "git branch [-a|-r] branchname".
10362 Nguyễn Thái Ngọc Duy (1):
10363 t7102: make the test fail if one of its check fails
10366 api-strbuf.txt: fix typos and document launch_editor()
10367 technical-docs: document hash API
10370 bash completion: factor submodules into dirty state
10373 Version v1.6.5.7; changes since v1.6.5.6:
10374 -----------------------------------------
10377 ignore unknown color configuration
10380 help.autocorrect: do not run a command if the command given is junk
10382 Junio C Hamano (2):
10383 worktree: don't segfault with an absolute pathspec without a work tree
10386 Nanako Shiraishi (1):
10387 Illustrate "filter" attribute with an example
10390 Version v1.6.5.6; changes since v1.6.5.5:
10391 -----------------------------------------
10394 pull: clarify advice for the unconfigured error case
10397 add-interactive: fix deletion of non-empty files
10399 Junio C Hamano (3):
10400 Remove post-upload-hook
10401 Fix archive format with -- on the command line
10405 merge-recursive: make the error-message generation an extern function
10406 builtin-merge: show user-friendly error messages for fast-forward too.
10409 Version v1.6.5.5; changes since v1.6.5.4:
10410 -----------------------------------------
10412 Avery Pennarun (1):
10413 builtin-merge.c: call exclude_cmds() correctly.
10416 t4201: use ISO8859-1 rather than ISO-8859-1
10419 grep: Allow case insensitive search of fixed-strings
10421 Felipe Contreras (2):
10422 format-patch: fix parsing of "--" on the command line
10423 format-patch: add test for parsing of "--"
10426 diffcore-break: free filespec data as we go
10427 diffcore-break: save cnt_data for other phases
10428 rerere: don't segfault on failure to open rr-cache
10429 reset: improve worktree safety valves
10431 Junio C Hamano (7):
10432 diffcore-rename: reduce memory footprint by freeing blob data early
10433 Documentation: avoid xmlto input error
10434 Protect scripted Porcelains from GREP_OPTIONS insanity
10435 Remove dead code from "git am"
10436 Documentation: xmlto 0.0.18 does not know --stringparam
10437 Prepare for 1.6.5.5
10440 Linus Torvalds (1):
10441 Fix diff -B/--dirstat miscounting of newly added contents
10443 Lukas Sandström (1):
10444 git am/mailinfo: Don't look at in-body headers when rebasing
10446 Matthew Ogilvie (1):
10447 core.autocrlf documentation: mention the crlf attribute
10450 Expand ~ and ~user in core.excludesfile, commit.template
10451 expand_user_path: expand ~ to $HOME, not to the actual homedir.
10452 merge-recursive: point the user to commit when file would be overwritten.
10453 user-manual: Document that "git merge" doesn't like uncommited changes.
10456 give priority to progress messages
10458 Philippe Bruhat (1):
10459 Make sure $PERL_PATH is defined when the test suite is run.
10462 Add branch management for releases to gitworkflows
10464 Ramsay Allan Jones (3):
10465 Makefile: merge two Cygwin configuration sections into one
10466 t9700-perl-git.sh: Fix a test failure on Cygwin
10467 git-count-objects: Fix a disk-space under-estimate on Cygwin
10470 mergetool--lib: simplify guess_merge_tool()
10471 archive: clarify description of path parameter
10474 Update 'git remote update' usage string to match man page.
10475 git remote: Separate usage strings for subcommands
10477 Todd Zullinger (1):
10478 Documentation: Avoid use of xmlto --stringparam
10480 Uwe Kleine-König (1):
10481 shortlog: respect commit encoding
10484 Version v1.6.5.4; changes since v1.6.5.3:
10485 -----------------------------------------
10488 help: Do not unnecessarily look for a repository
10490 David Soria Parra (1):
10491 Documentation: Document --branch option in git clone synopsis
10494 Documentation: undocument gc'd function graph_release()
10497 prune-packed: only show progress when stderr is a tty
10499 Junio C Hamano (7):
10500 builtin-apply.c: pay attention to -p<n> when determining the name
10501 Do not misidentify "git merge foo HEAD" as an old-style invocation
10502 merge: do not add standard message when message is given with -m option
10503 Prepare for 1.6.5.4
10504 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
10505 Unconditionally set man.base.url.for.relative.links
10508 Michael J Gruber (1):
10509 Documentation: Fix a few i.e./e.g. mix-ups
10512 pack-objects: split implications of --all-progress from progress activation
10515 instaweb: restart server if already running
10518 Version v1.6.5.3; changes since v1.6.5.2:
10519 -----------------------------------------
10521 Björn Gustavsson (1):
10522 git-clone.txt: Fix grammar and formatting
10524 Björn Steinbrink (1):
10525 pre-commit.sample: Diff against the empty tree when HEAD is invalid
10527 Clemens Buchacher (1):
10528 modernize fetch/merge/pull examples
10530 Daniel Barkalow (2):
10531 Require a struct remote in transport_get()
10532 Allow curl helper to work without a local repository
10534 Dmitry V. Levin (1):
10535 Makefile: add compat/bswap.h to LIB_H
10538 help -i: properly error out if no info viewer can be found
10541 More precise description of 'git describe --abbrev'
10542 Fix documentation grammar typo
10544 Giuseppe Bilotta (1):
10545 gitweb: fix esc_param
10547 Jakub Narebski (1):
10548 gitweb: Do not show 'patch' link for merge commits
10551 rebase -i: more graceful handling of invalid commands
10554 Documentation/fetch-options.txt: order options alphabetically
10555 Documentation/git-pull.txt: Add subtitles above included option files
10556 Documentation/merge-options.txt: order options in alphabetical groups
10559 cvsimport: fix relative argument filenames
10560 push: always load default config
10561 add-interactive: handle deletion of empty files
10562 ls-files: unbreak "ls-files -i"
10563 push: fix typo in usage
10564 format-patch: make "-p" suppress diffstat
10566 Johannes Schindelin (3):
10567 blame: make sure that the last line ends in an LF
10568 help -a: do not unnecessarily look for a repository
10569 diff --color-words -U0: fix the location of hunk headers
10571 Jonathan Nieder (4):
10572 clone: detect extra arguments
10573 Add intermediate build products to .gitignore
10574 check-ref-format: update usage string
10575 merge: do not setup worktree twice
10577 Junio C Hamano (22):
10578 apply --whitespace=fix: fix handling of blank lines at the eof
10579 apply --whitespace=fix: detect new blank lines at eof correctly
10580 apply.c: split check_whitespace() into two
10581 apply --whitespace=warn/error: diagnose blank at EOF
10582 apply --whitespace: warn blank but not necessarily empty lines at EOF
10583 diff.c: the builtin_diff() deals with only two-file comparison
10584 diff --whitespace=warn/error: obey blank-at-eof
10585 diff --whitespace=warn/error: fix blank-at-eof check
10586 diff --color: color blank-at-eof
10587 core.whitespace: split trailing-space into blank-at-{eol,eof}
10588 diff --whitespace: fix blank lines at end
10589 diff.c: shuffling code around
10590 diff.c: split emit_line() from the first char and the rest of the line
10591 diff.c: emit_add_line() takes only the rest of the line
10592 diff -B: colour whitespace errors
10593 info/grafts: allow trailing whitespaces at the end of line
10594 gc --auto --quiet: make the notice a bit less verboase
10595 receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
10596 clone: fix help on options
10597 diff --color-words: bit of clean-up
10598 check-ref-format -h: it does not know the --print option yet
10601 Markus Heidelberg (1):
10602 t4034-diff-words: add a test for word diff without context
10605 gitweb: Fix blob linenr links in pathinfo mode
10607 Sebastian Schuberth (1):
10608 Do not try to remove directories when removing old links
10611 git-add.txt: fix formatting of --patch section
10614 Quote ' as \(aq in manpages
10616 Todd Zullinger (1):
10617 Makefile: Ensure rpm packages can be read by older rpm versions
10620 imap-send.c: fix compiler warnings for OpenSSL 1.0
10623 Version v1.6.5.2; changes since v1.6.5.1:
10624 -----------------------------------------
10626 Andreas Schwab (1):
10627 Work around option parsing bug in the busybox tar implementation
10629 Carlos R. Mafra (1):
10630 Makefile: clean block-sha1/ directory instead of mozilla-sha1/
10633 ls-files: excludes should not impact tracked files
10634 document push's new quiet option
10637 git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
10640 Remove a left-over file from t/t5100
10641 Mark files in t/t5100 as UTF-8
10643 Jonathan Nieder (1):
10644 Documentation: describe check-ref-format --branch
10646 Junio C Hamano (4):
10647 Fix incorrect error check while reading deflated pack data
10648 Do not fail "describe --always" in a tag-less repository
10649 Fix list of released versions in the toc document
10652 Markus Heidelberg (1):
10653 t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
10656 Documentation/git-gc.txt: change "references" to "reference"
10658 Nanako Shiraishi (2):
10659 git push: remove incomplete options list from help text
10660 git push: say that --tag can't be used with --all or --mirror in help text
10662 Nasser Grainawi (1):
10663 Document `delta` attribute in "git help attributes".
10665 Pauli Virtanen (1):
10666 git-add--interactive: never skip files included in index
10669 Version v1.6.5.1; changes since v1.6.5:
10670 ---------------------------------------
10672 Björn Steinbrink (1):
10673 clone: Supply the right commit hash to post-checkout when -b is used
10676 remote-curl: add missing initialization of argv0_path
10678 Junio C Hamano (1):
10682 grep: do not segfault when -f is used
10685 git-stash documentation: mention default options for 'list'
10688 change throughput display units with fast links
10690 Shawn O. Pearce (1):
10691 sha1_file: Fix infinite loop when pack is corrupted
10694 Version v1.6.5; changes since v1.6.5-rc3:
10695 -----------------------------------------
10697 Alexander Gavrilov (1):
10698 git-svn: Avoid spurious errors when rewriteRoot is used.
10701 ls-files: die instead of fprintf/exit in -i error
10703 Björn Gustavsson (1):
10704 bash: add support for 'git replace'
10707 Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64
10708 Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64
10710 Christian Himpel (2):
10711 git-am: fixed patch_format detection according to RFC2822
10712 git-am: force egrep to use correct characters set
10714 Erik Faye-Lund (2):
10715 increase portability of NORETURN declarations
10716 add NORETURN_PTR for function pointers
10718 Felipe Contreras (1):
10719 send-email: fix mutt regex for grouped aliases
10721 Ingmar Vanhassel (1):
10722 import-tars: Add missing closing bracket
10725 improve reflog date/number heuristic
10726 pull: improve advice for unconfigured error case
10728 Jonathan Nieder (8):
10729 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile
10730 Documentation: git fmt-merge-msg does not have to be a script
10731 Documentation: clarify mergeoptions description
10732 Documentation: branch: update --merged description
10733 Documentation: clarify branch creation
10734 Documentation: clarify "working tree" definition
10735 racy-git.txt: explain nsec problem in more detail
10736 Documentation: clone: clarify discussion of initial branch
10738 Junio C Hamano (2):
10739 Update draft release notes to 1.6.5
10742 Ramsay Allan Jones (2):
10743 Fix MSVC build on cygwin
10744 Fix the exit code of MSVC build scripts on cygwin
10747 Git archive and trailing "/" in prefix
10750 git-svn: hide find_parent_branch output in double quiet mode
10753 completion: fix completion of git <TAB><TAB>
10754 completion: fix alias listings with newlines
10757 Version v1.6.5-rc3; changes since v1.6.5-rc2:
10758 ---------------------------------------------
10761 filter-branch: add --prune-empty to option summary
10763 Andreas Schwab (1):
10764 parse-opt: ignore negation of OPT_NONEG for ambiguity checks
10767 perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
10768 Documentation/git-gc.txt: default --aggressive window is 250, not 10
10769 Makefile: enable THREADED_DELTA_SEARCH on SunOS
10771 Frederik Schwarzer (1):
10772 Correct minor typo in post-receive hook template
10775 typo fix: Directory `...' exist, ...: s/exist/exists/
10778 Fix '--relative-date'
10780 Junio C Hamano (4):
10781 builtin-mailinfo.c: check error status from rewind and ftruncate
10782 show-branch: fix segfault when showbranch.default exists
10783 git-pull: dead code removal
10784 fast-import.c::validate_raw_date(): really validate the value
10787 tests: make all test files executable
10789 Michael Wookey (1):
10790 generators/vcproj.pm: remove UNICODE from build
10793 git branch -D: give a better error message when lockfile creation fails
10796 make 'git clone' ask the remote only for objects it cares about
10798 Ramsay Allan Jones (1):
10799 Fix some printf format warnings
10802 bash: teach 'git checkout' options
10804 Sebastian Schuberth (2):
10805 Make generated MSVC solution file open from Windows Explorer
10806 Make just opening the generated MSVC solution file not modify it
10809 README: git lives at http://git-scm.com these days
10812 completion: update am, commit, and log
10813 completion: add dirstat and friends to diff options
10816 send-email: fix obscure error when encryption=tls and smtp cannot connect
10819 Version v1.6.5-rc2; changes since v1.6.5-rc1:
10820 ---------------------------------------------
10822 Clemens Buchacher (2):
10823 test local clone by copying
10824 cvs: initialize empty password
10826 Dmitry Potapov (2):
10827 git-archive: add '-o' as a alias for '--output'
10828 git-archive: infer output format from filename when unspecified
10831 Avoid declaration after statement
10832 Change regerror() declaration from K&R style to ANSI C (C89)
10833 Fix __stdcall placement and function prototype
10834 Test for WIN32 instead of __MINGW32_
10835 Add MinGW header files to build git with MSVC
10836 Add platform files for porting to MSVC
10839 remove logical typo in documentation of sample update hook
10840 web--browse: fix Mac OS X GUI detection for 10.6
10843 pre-commit.sample: add comment re tr portability; fix grammar
10845 Johannes Gilger (1):
10846 git-clone doc: typofix
10849 test-genrandom: ensure stdout is set to _O_BINARY on Windows
10851 Junio C Hamano (6):
10852 git-commit doc: remove duplicated --dry-run description
10853 http.c: avoid freeing an uninitialized pointer
10855 Update Release Notes to 1.6.5
10856 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
10857 pull: Clarify "helpful" message for another corner case
10859 Marius Storm-Olsen (9):
10860 Add include guards to compat/win32.h
10861 Set _O_BINARY as default fmode for both MinGW and MSVC
10862 Add empty header files for MSVC port
10863 Make usage of windows.h lean and mean
10864 Define strncasecmp and ftruncate for MSVC
10865 Add MSVC to Makefile
10866 Add README for MSVC build
10867 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake)
10868 Tag GIT_VERSION when Git is built with MSVC
10871 push: Correctly initialize nonfastforward in transport_push.
10874 git-push: Accept -n as a synonym for --dry-run.
10877 Nicolas Pitre has a new email address
10880 gitk: Work around leftover temporary save file
10882 Paul Mackerras (1):
10883 gitk: Show diff of commits at end of compare-commits output
10885 Peter Krefting (1):
10886 gitk: Update Swedish translation (280t0f0u)
10889 bash: rename __git_find_subcommand() to __git_find_on_cmdline()
10890 bash: update 'git stash' completion
10891 bash: teach 'git reset --patch'
10894 Update the usage bundle string.
10895 pack-objects: remove SP at the end of usage string
10896 Update "describe" documentation to match reality
10898 Todd Zullinger (1):
10899 completion: Replace config --list with --get-regexp
10902 Version v1.6.5-rc1; changes since v1.6.5-rc0:
10903 ---------------------------------------------
10905 Brian Gernhardt (4):
10906 INSTALL: Update description of our SHA-1 code
10907 Makefile: Add NEEDS_CRYPTO_WITH_SSL
10908 INSTALL: Reorder dependencies, split shell and Perl
10909 INSTALL: Describe dependency knobs from Makefile
10911 Clemens Buchacher (3):
10912 grep: fix exit status if external_grep() punts
10913 grep: accept relative paths outside current working directory
10914 preserve mtime of local clone
10916 Daniel Barkalow (4):
10917 Add support for external programs for handling native fetches
10918 Use an external program to implement fetching with curl
10919 Make the "traditionally-supported" URLs a special case
10920 Use a clearer style to issue commands to remote helpers
10923 Improve --patch option documentation in git-add
10926 Makefile: git-http-fetch does not need expat
10927 push: make non-fast-forward help message configurable
10928 status: make "how to stage" messages optional
10929 rebase: use plumbing to show dirty state
10932 use write_str_in_full helper to avoid literal string lengths
10933 use write_str_in_full helper to avoid literal string lengths
10934 don't dereference NULL upon fdopen failure
10937 start_command: do not clobber cmd->env on Windows code path
10938 pager: set LESS=FRSX also on Windows
10941 Wrap rewrite globals in a struct in preparation for adding another set
10942 Add url.<base>.pushInsteadOf: URL rewriting for push only
10944 Junio C Hamano (7):
10945 Makefile: do not link three copies of git-remote-* programs
10946 Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
10947 merge-recursive: give less scary messages when merge did not start
10948 Makefile: remove remnant of separate http/https/ftp helpers
10950 quiltimport documentation: --dry-run and -n are synonyms
10953 Linus Torvalds (1):
10954 git-http-fetch: not a builtin
10957 svn: properly escape arguments for authors-prog
10959 Martin Nordholts (1):
10960 git.el: Use git-add-file for unmerged files, remove git-resolve-file
10963 wrap git's main usage string.
10966 Add transport native helper executables to .gitignore
10967 http-fetch: Fix Makefile dependancies
10969 Nicolas Sebrecht (2):
10970 mailinfo: add '--scissors' to usage message
10971 add documentation for mailinfo.scissors and '--no-scissors'
10973 Peter Krefting (2):
10974 import-tars: Allow per-tar author and commit message.
10975 Add script for importing bits-and-pieces to Git.
10978 git-p4: Avoid modules deprecated in Python 2.6.
10981 http.c: remove verification of remote packs
10984 Version v1.6.5-rc0; changes since v1.6.4.5:
10985 -------------------------------------------
10988 svn: Add && to t9107-git-svn-migrate.sh
10989 svn: Honor --prefix option in init without --stdlayout
10990 svn: allow branches outside of refs/remotes
10993 graph API: use a new color when starting a brand new column
10994 graph API: fix bug in graph_is_interesting()
10995 Add tests for rev-list --graph with options that simplify history
10998 Add a reminder test case for a merge with F/D transition
10999 Add date formatting and parsing functions relative to a given time
11001 Alexandre Julliard (1):
11002 read-tree: Fix regression with creation of a new index file.
11004 André Goddard Rosa (1):
11005 Fix typos on pt_BR/gittutorial.txt translation
11007 Benjamin Kramer (1):
11008 gitweb: Optimize git-favicon.png
11010 Björn Steinbrink (1):
11011 git-describe: Die early if there are no possible descriptions
11014 strbuf: add new function strbuf_getwholeline()
11015 builtin-mailinfo,builtin-mailsplit: use strbufs
11016 builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
11017 block-sha1/sha1.c: silence compiler complaints by casting void * to char *
11018 git-compat-util.h: remove superfluous test for __sun__
11019 Makefile: remove pointless conditional assignment in SunOS section
11020 abspath.c: move declaration of 'len' into inner block and use appropriate type
11021 commit.c: rename variable named 'n' which masks previous declaration
11022 t/test-lib.sh: provide a shell implementation of the 'yes' utility
11024 Brian Gianforcaro (1):
11025 Style fixes, add a space after if/for/while.
11027 Christian Couder (13):
11028 refs: add a "for_each_replace_ref" function
11029 replace_object: add mechanism to replace objects found in "refs/replace/"
11030 sha1_file: add a "read_sha1_file_repl" function
11031 object: call "check_sha1_signature" with the replacement sha1
11032 replace_object: add a test case
11033 mktag: call "check_sha1_signature" with the replacement sha1
11034 environment: add global variable to disable replacement
11035 Add new "git replace" command
11036 builtin-replace: teach "git replace" to actually replace
11037 parse-options: add new function "usage_msg_opt"
11038 builtin-replace: use "usage_msg_opt" to give better error messages
11039 Documentation: add documentation for "git replace"
11040 t6050: check pushing something based on a replaced commit
11043 Add git-replace to .gitignore
11046 git.el: Clarify documentation of git-commit-tree
11048 David Soria Parra (1):
11049 run-command.c: squelch a "use before assignment" warning
11052 git-cvsimport: add support for cvs pserver password scrambling.
11055 svn: initial "master" points to trunk if possible
11056 svn: (cleanup) use predefined constant for rev_map_fmt
11057 svn: assume URLs from the command-line are URI-encoded
11059 Geoffrey Irving (1):
11060 git fast-export: add --no-data option
11062 Giuseppe Bilotta (3):
11063 gitweb: fix 'Use of uninitialized value' error in href()
11064 git apply: option to ignore whitespace differences
11065 gitweb: pull ref markes pull out of subject <a> element
11068 cvsimport: add test illustrating a bug in cvsps
11069 cvsimport: extend testcase about patchset order to contain branches
11071 Jakub Narebski (6):
11072 gitweb: Make .error style generic
11073 gitweb: Mark boundary commits in 'blame' view
11074 gitweb: Use "previous" header of git-blame -p in 'blame' view
11075 gitweb: Mark commits with no "previous" in 'blame' view
11076 gitweb: Add author initials in 'blame' view, a la "git gui blame"
11077 gitweb: Use light/dark for class names also in 'blame' view
11080 git-tag(1): Refer to git-check-ref-format(1) for <name>
11083 push: add --quiet flag
11084 transport: pass "quiet" flag to pack-objects
11085 transport: don't show push status if --quiet is given
11086 tests: use "$TEST_DIRECTORY" instead of ".."
11087 tests: provide $TRASH_DIRECTORY variable
11088 tests: allow user to specify trash directory location
11089 t/Makefile: include config.mak
11090 allow pull --rebase on branch yet to be born
11091 tests: disable interactive hunk selection tests if perl is not available
11092 clone: add --branch option to select a different HEAD
11093 refactor test-date interface
11094 tests: add date printing and parsing tests
11095 fix approxidate parsing of relative months and years
11096 push: teach --quiet to suppress "Everything up-to-date"
11099 Check return value of ftruncate call in http.c
11102 git submodule summary: add --files option
11105 git submodule foreach: Provide access to submodule name, as '$name'
11106 git submodule: Cleanup usage string and add option parsing to cmd_foreach()
11107 Add selftest for 'git submodule foreach'
11108 git submodule foreach: test access to submodule name as '$name'
11109 git submodule foreach: Add --recursive to recurse into nested submodules
11110 git submodule update: Introduce --recursive to update nested submodules
11111 git submodule status: Add --recursive to recurse into nested submodules
11112 t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
11113 git clone: Add --recursive to automatically checkout (nested) submodules
11115 Johannes Schindelin (2):
11116 Make 'git stash -k' a short form for 'git stash save --keep-index'
11117 parse-opt: optionally show "--no-" option string
11119 Johannes Sixt (13):
11120 MinGW: simplify waitpid() emulation macros
11121 run_command: return exit code as positive value
11122 run_command: report system call errors instead of returning error codes
11123 run_command: encode deadly signal number in the return value
11124 run_command: report failure to execute the program, but optionally don't
11125 receive-pack: remove unnecessary run_status report
11126 api-run-command.txt: describe error behavior of run_command functions
11127 t0001-init: fix a file name
11128 t0001-init: split the existence test from the permission test
11129 gitk: Do not hard-code "encoding" in attribute lookup functions
11130 Make test number t7406- unique
11131 Make test case number unique
11132 status: list unmerged files much later
11134 Junio C Hamano (31):
11135 t/t9600: remove exit after test_done
11137 request-pull: optionally show a patch as well
11138 diff-index: report unmerged new entries
11139 diff-index: keep the original index intact
11140 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
11141 wt-status.c: rework the way changes to the index and work tree are summarized
11142 git-rev-list.txt: Clarify the use of multiple revision arguments
11143 block-sha1: undo ctx->size change
11144 block-sha1: minor fixups
11145 am: allow individual e-mail files as input
11146 status: show worktree status of conflicted paths separately
11147 verify-pack --stat-only: show histogram without verifying
11149 wt-status: move many global settings to wt_status structure
11150 wt-status: move wt_status_colors[] into wt_status structure
11151 Make git_status_config() file scope static to builtin-commit.c
11152 wt-status: collect untracked files in a separate "collect" phase
11153 Documentation/git-commit.txt: describe --dry-run
11154 git commit --dry-run -v: show diff in color when asked
11155 compat/snprintf.c: clarify SNPRINTF_SIZE_CORR
11156 builtin-mailinfo.c: fix confusing internal API to mailinfo()
11157 Teach mailinfo to ignore everything before -- >8 -- mark
11158 am/mailinfo: Disable scissors processing by default
11159 mailinfo.scissors: new configuration
11160 Draft release notes to 1.6.5 before -rc0
11161 upload-pack: add a trigger for post-upload-pack hook
11162 upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
11163 builtin-pack-objects.c: avoid vla
11164 builtin-apply.c: get rid of an unnecessary use of temporary array
11168 git-svn: Use GIT_SSH setting if SVN_SSH is not set
11171 Documentaqtion/git-submodule.txt: Typofix
11172 git-log: allow --decorate[=short|full]
11174 Linus Torvalds (12):
11175 Add new optimized C 'block-sha1' routines
11176 block-sha1: try to use rol/ror appropriately
11177 block-sha1: make the 'ntohl()' part of the first SHA1 loop
11178 block-sha1: re-use the temporary array as we calculate the SHA1
11179 block-sha1: macroize the rounds a bit further
11180 block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3
11181 block-sha1: get rid of redundant 'lenW' context
11182 block-sha1: perform register rotation using cpp
11183 block-sha1: improved SHA1 hashing
11184 block-sha1: improve code on large-register-set machines
11185 Improve on 'approxidate'
11186 Further 'approxidate' improvements
11189 git-p4: stream from perforce to speed up clones
11192 gitweb: support to globally disable a snapshot format
11193 gitweb: update INSTALL regarding specific snapshot settings
11194 gitweb: add support for XZ compressed snapshots
11197 gitweb: improve snapshot error handling
11198 gitweb: split test suite into library and tests
11199 gitweb: add t9501 tests for checking HTTP status codes
11202 rebase: consistent error messages for staged and unstaged changes.
11203 git-ls-files.txt: clarify what "other files" mean for --other
11204 Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
11205 Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
11206 reset: make the reminder output consistent with "checkout"
11207 stash: simplify defaulting to "save" and reject unknown options
11209 Michael Haggerty (6):
11210 Start a library for cvsimport-related tests
11211 Use CVS's -f option if available (ignore user's ~/.cvsrc file)
11212 Test contents of entire cvsimported "master" tree contents
11213 Add some tests of git-cvsimport's handling of vendor branches
11214 Add a test of "git cvsimport"'s handling of tags and branches
11215 git-svn: ignore leading blank lines in svn:ignore
11217 Michael J Gruber (3):
11218 t6010-merge-base.sh: Depict the octopus test graph
11219 git-merge-base/git-show-branch: Cleanup documentation and usage
11220 git-merge-base/git-show-branch --merge-base: Documentation and test
11222 Michał Kiedrowicz (2):
11223 init-db: migrate to parse-options
11224 grep: Add --max-depth option.
11226 Nanako Shiraishi (3):
11227 git init: optionally allow a directory argument
11228 Documentation: consistently refer to check-ref-format
11229 Documentation: describe the scissors mark support of "git am"
11231 Nguyễn Thái Ngọc Duy (1):
11232 Prevent diff machinery from examining assume-unchanged entries on worktree
11235 Shift object enumeration out of upload-pack
11237 Nicolas Pitre (11):
11238 block-sha1: move code around
11239 block-sha1: split the different "hacks" to be individually selected
11240 block-sha1: support for architectures with memory alignment restrictions
11241 block-sha1: more good unaligned memory access candidates
11242 block-sha1: make the size member first in the context struct
11243 make sure byte swapping is optimal for git
11244 block-sha1: guard gcc extensions with __GNUC__
11245 remove ARM and Mozilla SHA1 implementations
11246 fix simple deepening of a repo
11247 make shallow repository deepening more network efficient
11248 pack-objects: free preferred base memory after usage
11250 Nicolas Sebrecht (1):
11251 git-am: print fair error message when format detection fails
11254 git stash: Give friendlier errors when there is nothing to apply
11257 Do not scramble password read from .cvspass
11260 update-server-info: make builtin, use parseopt
11261 UI consistency: allow --force for where -f means force
11264 read-tree: convert unhelpful usage()'s to helpful die()'s
11265 read-tree: migrate to parse-options
11266 write-tree: migrate to parse-options
11267 verify-tag: migrate to parse-options
11268 verify-pack: migrate to parse-options
11269 prune-packed: migrate to parse-options
11270 technical-docs: document tree-walking API
11273 http.c: free preq when aborting
11274 http.c: replace usage of temporary variable for urls
11276 Thadeu Lima de Souza Cascardo (1):
11277 Translate the tutorial to Brazillian Portuguese
11280 Document 'stash clear' recovery via unreachable commits
11281 gitk: New option to hide remote refs
11282 gitk: Fix direction of symmetric difference in optimized mode
11283 gitk: Parse arbitrary commit-ish in SHA1 field
11284 git-apply--interactive: Refactor patch mode code
11285 Add a small patch-mode testing library
11286 builtin-add: refactor the meat of interactive_add()
11287 Implement 'git reset --patch'
11288 Implement 'git checkout --patch'
11289 Implement 'git stash save --patch'
11290 DWIM 'git stash save -p' for 'git stash -p'
11292 Tuomas Suutari (1):
11293 git-svn.txt: Fix location of parent argument
11295 Wesley J. Landaker (2):
11296 Documentation: git-send-email: fix submission port number
11297 Documentation: git-send-email: correct statement about standard ports
11300 Add support for the Mongoose web server.
11303 Version v1.6.4.5; changes since v1.6.4.4:
11304 -----------------------------------------
11306 Andreas Gruenbacher (3):
11307 base85 debug code: Fix length byte calculation
11308 base85: encode_85() does not use the decode table
11309 base85: Make the code more obvious instead of explaining the non-obvious
11311 Andreas Schwab (1):
11312 git count-objects: handle packs bigger than 4G
11315 ls-files: die instead of fprintf/exit in -i error
11318 help -i: properly error out if no info viewer can be found
11321 Check size of path buffer before writing into it
11324 commit: --cleanup is a message option
11326 Jakub Narebski (1):
11327 gitweb: Introduce esc_attr to escape attributes of HTML elements
11330 rebase -i: more graceful handling of invalid commands
11333 ls-files: excludes should not impact tracked files
11334 textconv: stop leaking file descriptors
11336 Jonathan Nieder (1):
11337 Documentation: describe check-ref-format --branch
11339 Junio C Hamano (5):
11340 show-branch: fix segfault when showbranch.default exists
11341 fast-import.c::validate_raw_date(): really validate the value
11342 checkout -m: do not try to fall back to --merge from an unborn branch
11343 Fix mis-backport of t7002
11347 grep: do not segfault when -f is used
11350 push: Correctly initialize nonfastforward in transport_push.
11351 branch: die explicitly why when calling "git branch [-a|-r] branchname".
11354 git-stash documentation: mention default options for 'list'
11356 Nguyễn Thái Ngọc Duy (1):
11357 t7102: make the test fail if one of its check fails
11359 Uwe Kleine-König (1):
11360 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
11363 Version v1.6.4.4; changes since v1.6.4.3:
11364 -----------------------------------------
11367 checkout: do not imply "-f" on unborn branches
11369 Junio C Hamano (6):
11370 Fix "unpack-objects --strict"
11371 check_path(): allow symlinked directories to checkout-index --prefix
11372 xutils: Fix hashing an incomplete line with whitespaces at the end
11373 xutils: Fix xdl_recmatch() on incomplete lines
11374 http.c: avoid freeing an uninitialized pointer
11378 Version v1.6.4.3; changes since v1.6.4.2:
11379 -----------------------------------------
11382 githooks.txt: put hooks into subsections
11384 Clemens Buchacher (2):
11385 grep: fix exit status if external_grep() punts
11386 grep: accept relative paths outside current working directory
11388 Emmanuel Trillaud (1):
11389 git-pull: do not mention --quiet and --verbose twice
11392 git-cvsserver: no longer use deprecated 'git-subcommand' commands
11395 clone: disconnect transport after fetching
11396 push: fix english in non-fast-forward message
11397 push: re-flow non-fast-forward message
11399 Junio C Hamano (1):
11403 svn: properly escape arguments for authors-prog
11406 git-clone: add missing comma in --reference documentation
11409 http.c: remove verification of remote packs
11412 Version v1.6.4.2; changes since v1.6.4.1:
11413 -----------------------------------------
11416 Minor improvement to the write-tree documentation
11419 Round-down years in "years+months" relative date view
11422 add tests for merge message headings
11423 merge: fix incorrect merge message for ambiguous tag/branch
11424 merge: indicate remote tracking branches in merge message
11426 Johannes Schindelin (2):
11427 Expose the has_non_ascii() function
11428 Correctly mark cover letters' encodings if they are not pure ASCII
11431 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
11433 Junio C Hamano (3):
11434 apply: notice creation/removal patches produced by GNU diff
11435 clean: require double -f options to nuke nested git repository and work tree
11438 Kirill Smelkov (1):
11439 git add -p: demonstrate failure when staging both mode and hunk
11442 lstat_cache: guard against full match of length of 'name' parameter
11445 git-log: allow --decorate[=short|full]
11447 Linus Torvalds (1):
11448 git-checkout: be careful about untracked symlinks
11450 Nanako Shiraishi (3):
11451 git-bisect: call the found commit "*the* first bad commit"
11452 Fix overridable written with an extra 'e'
11453 Remove unused t/t8005/iso8859-5.txt
11455 Pickens, James E (1):
11456 Demonstrate bugs when a directory is replaced with a symlink
11459 http.c: don't assume that urls don't end with slash
11460 http.c: set slot callback members to NULL when releasing object
11463 add -p: do not attempt to coalesce mode changes
11465 Wesley J. Landaker (1):
11466 Documentation: git-archive: mark --format as optional in summary
11469 Version v1.6.4.1; changes since v1.6.4:
11470 ---------------------------------------
11472 Björn Steinbrink (1):
11473 config: Keep inner whitespace verbatim
11475 Erik Faye-Lund (1):
11476 send-email: remove debug trace
11478 Jakub Narebski (1):
11479 gitweb/README: Document $base_url
11482 show: suppress extra newline when showing annotated tag
11483 show: add space between multiple items
11484 docs: describe impact of repack on "clone -s"
11487 Documentation: git submodule: add missing options to synopsis
11490 help.c: give correct structure's size to memset()
11492 Johannes Schindelin (1):
11493 filter-branch: add an example how to add ACKs to a range of commits
11495 Junio C Hamano (5):
11496 merge-recursive: don't segfault while handling rename clashes
11497 t5510: harden the way verify-pack is used
11498 verify-pack -v: do not report "chain length 0"
11499 am: allow individual e-mail files as input
11503 git-instaweb: fix mod_perl detection for apache2
11506 Better usage string for reflog.
11507 push: point to 'git pull' and 'git push --force' in case of non-fast forward
11508 filter-branch: make the usage string fit on 80 chars terminals.
11511 hg-to-git: don't import the unused popen2 module
11514 don't let the delta cache grow unbounded in 'git repack'
11516 Nicolas Sebrecht (1):
11517 git-am: print fair error message when format detection fails
11520 Change mentions of "git programs" to "git commands"
11523 Documentation: merge: one <remote> is required
11524 Documentation: add: <filepattern>... is optional
11527 t5520-pull: Test for rebased upstream + fetch + pull --rebase
11528 pull: support rebased upstream + fetch + pull --rebase
11531 gitweb: parse_commit_text encoding fix
11534 Fix typos in git-remote.txt and git-symbolic-ref.txt
11537 Version v1.6.4; changes since v1.6.4-rc3:
11538 -----------------------------------------
11541 Update the documentation of the raw diff output format
11544 fast-export: Set revs.topo_order before calling setup_revisions
11545 fast-export: Omit tags that tag trees
11546 fast-export: Make sure we show actual ref names instead of "(null)"
11547 fast-export: Do parent rewriting to avoid dropping relevant commits
11548 fast-export: Add a --tag-of-filtered-object option for newly dangling tags
11549 Add new fast-export testcases
11550 fast-export: Document the fact that git-rev-list arguments are accepted
11553 t9143: do not fail if Compress::Zlib is missing
11556 Fix rebase -p --onto
11558 Junio C Hamano (2):
11562 Michael J Gruber (1):
11563 git-rerere.txt: Clarify ambiguity of the config variable
11565 Sean Estabrooks (1):
11566 Trivial path quoting fixes in git-instaweb
11569 config.txt: document add.ignore-errors
11572 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
11575 Version v1.6.4-rc3; changes since v1.6.4-rc2:
11576 ---------------------------------------------
11579 Make section_name_match start on '[', and return the length on success
11580 After renaming a section, print any trailing variable definitions
11582 Björn Steinbrink (1):
11583 Add a test showing that 'git repack' throws away grafted-away parents
11585 Daniel Trstenjak (1):
11586 Show the presence of untracked files in the bash prompt.
11589 git svn: fix shallow clone when upstream revision is too new
11590 git svn: revert default behavior for --minimize-url
11591 git svn: the branch command no longer needs the full path
11592 t9142: stop httpd after the test
11593 git svn: avoid escaping '/' when renaming/copying files
11594 git svn: make minimize URL more reliable over http(s)
11597 send-email: detect cycles in alias expansion
11599 Johannes Schindelin (1):
11600 git repack: keep commits hidden by a graft
11602 Junio C Hamano (6):
11603 do_one_ref(): null_sha1 check is not about broken ref
11604 SunOS grep does not understand -C<n> nor -e
11605 Update release notes for 1.6.4
11606 Fix severe breakage in "git-apply --whitespace=fix"
11607 t8005: Nobody writes Russian in shift_jis
11610 Linus Torvalds (3):
11611 git branch: fix performance problem
11612 git branch: avoid unnecessary object lookups
11613 git branch: clean up detached branch handling
11615 Matthias Andree (1):
11616 Fix export_marks() error handling.
11618 Nanako Shiraishi (1):
11619 Documentation/config.txt: a variable can be defined on the section header line
11621 Robert Allan Zeh (1):
11622 git svn: add gc command
11625 Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
11628 Version v1.6.4-rc2; changes since v1.6.4-rc1:
11629 ---------------------------------------------
11632 refs.c: release file descriptor on error return
11633 sha1_name.c: avoid unnecessary strbuf_release
11634 configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
11635 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
11638 git svn: rename tests that had conflicting numbers
11639 git svn: fix reparenting when ugly http(s) URLs are used
11641 Junio C Hamano (5):
11642 checkout -f: deal with a D/F conflict entry correctly
11643 push: do not give big warning when no preference is configured
11644 Updates to draft release notes to 1.6.4
11645 combine-diff.c: fix performance problem when folding common deleted lines
11646 diff --cc: a lost line at the beginning of the file is shown incorrectly
11648 Martin Koegler (1):
11649 git stash: modernize use of "dashed" git-XXX calls
11651 Michael J Gruber (1):
11652 t4202-log.sh: Test git log --no-walk sort order
11655 cvsexportcommit: reorder tests to quiet intermittent failure
11657 Pierre Habouzit (4):
11658 janitor: use NULL and not 0 for pointers.
11659 refactor: use bitsizeof() instead of 8 * sizeof()
11660 janitor: add DIV_ROUND_UP and use it.
11661 janitor: useless checks before free
11664 Trailing whitespace and no newline fix
11667 List send-email config options in config.txt.
11668 Improve doc for format-patch threading options.
11671 Version v1.6.4-rc1; changes since v1.6.4-rc0:
11672 ---------------------------------------------
11674 Andreas Ericsson (1):
11675 mailinfo: Remove only one set of square brackets
11678 unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
11679 git-compat-util.h: adjust for SGI IRIX 6.5
11680 Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
11681 Makefile: add section for SGI IRIX 6.5
11682 Makefile: update IRIX64 section
11685 git svn: allow uppercase UUIDs from SVN
11688 quickfetch(): Prevent overflow of the rev-list command line
11690 Junio C Hamano (2):
11691 Makefile: keep "git" when bindir is execdir
11692 Revert "mailinfo: Remove only one set of square brackets"
11694 Linus Torvalds (10):
11695 Add 'fill_directory()' helper function for directory traversal
11696 Simplify read_directory[_recursive]() arguments
11697 Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
11698 Avoid using 'lstat()' to figure out directories
11699 Prepare symlink caching for thread-safety
11700 Export thread-safe version of 'has_symlink_leading_path()'
11701 Make index preloading check the whole path to the file
11702 Make 'git show' more useful
11703 Improve on the 'invalid object' error message at commit time
11704 Fix extraneous lstat's in 'git checkout -f'
11706 Mattias Nissler (2):
11707 git-svn: Always duplicate paths returned from get_log
11708 git-svn: Fix branch detection when repository root is inaccessible
11711 Document 'git (rev-list|log) --merges'
11712 bash: add '--merges' to common 'git log' options
11714 Wincent Colaiuta (1):
11715 gitweb: update Git homepage URL
11718 Version v1.6.4-rc0; changes since v1.6.3.4:
11719 -------------------------------------------
11722 Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
11725 Quote LF in urls git fetch saves in FETCH_HEAD
11726 Use UTF-8 instead of utf8 for backward compatibility
11727 Improve the naming of guessed target repository for git clone
11730 git-svn: Fix for svn paths removed > log-window-size revisions ago
11731 git-svn: Correctly report max revision when following deleted paths
11732 git-svn: Set svn.authorsfile if it is passed to git svn clone
11735 graph API: Use horizontal lines for more compact graphs
11737 Andreas Ericsson (1):
11738 fetch: Strip usernames from url's before storing them
11741 Add 'git svn help [cmd]' which works outside a repo.
11742 git-svn: speed up find_rev_before
11743 Add 'git svn reset' to unwind 'git svn fetch'
11745 Benjamin Kramer (1):
11746 imap-send: add support for IPv6
11749 builtin-remote: (get_one_entry): use strbuf
11751 Björn Steinbrink (1):
11752 git-apply(1): Clarify that one can select where to apply the patch
11754 Brandon Casey (23):
11755 t3900: use ancient iconv names for backward compatibility
11756 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
11757 builtin-mailinfo.c: compare character encodings case insensitively
11758 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
11759 t3901: avoid negation on right hand side of '|'
11760 t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
11761 t9301: use ISO8859-1 rather than ISO-8859-1
11762 t5100: use ancient encoding syntax for backwards compatibility
11763 t8005: use more portable character encoding names
11764 t8005: convert CP1251 character set to ISO8859-5
11765 t8005: fix typo, it's ISO-8859-5, not KOI8-R
11766 Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
11767 Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
11768 On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
11769 git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
11770 Makefile: define __sun__ on SunOS
11771 Makefile: add section for SunOS 5.7
11772 git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
11773 git-send-email.perl: improve detection of MIME encoded-words
11774 send-email: use UTF-8 rather than utf-8 for consistency
11775 Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
11776 t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH
11777 git.c: avoid allocating one-too-many elements for new argv array
11779 Christian Couder (30):
11780 rev-list: make "estimate_bisect_steps" non static
11781 rev-list: refactor printing bisect vars
11782 bisect: move common bisect functionality to "bisect_common"
11783 bisect--helper: add "--next-exit" to output bisect results
11784 bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
11785 bisect--helper: remove "--next-vars" option as it is now useless
11786 rev-list: remove stringed output flag from "show_bisect_vars"
11787 rev-parse: add --sq-quote to shell quote arguments
11788 bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
11789 am: simplify "sq" function by using "git rev-parse --sq-quote"
11790 bisect: use "sha1_array" to store skipped revisions
11791 bisect: implement "rev_argv_push" to fill an argv with revs
11792 bisect: store good revisions in a "sha1_array"
11793 bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
11794 bisect: remove too much function nesting
11795 bisect: make skipped array functions more generic
11796 bisect: automatically sort sha1_array if needed when looking it up
11797 bisect: implement the "check_merge_bases" function
11798 bisect: add "check_good_are_ancestors_of_bad" function
11799 bisect: make "git bisect" use new "--next-all" bisect-helper function
11800 bisect: rework some rev related functions to make them more reusable
11801 commit: add function to unparse a commit and its parents
11802 bisect: check ancestors without forking a "git rev-list" process
11803 bisect: drop unparse_commit() and use clear_commit_marks()
11804 bisect: display first bad commit without forking a new process
11805 bisect: add parameters to "filter_skipped"
11806 bisect: when skipping, choose a commit away from a skipped commit
11807 t6030: test skipping away from an already skipped commit
11808 bisect: use a PRNG with a bias when skipping away from untestable commits
11809 Documentation: remove warning saying that "git bisect skip" may slow bisection
11811 Christian Stimming (1):
11812 gitk: Update German translation.
11814 Clemens Buchacher (5):
11815 http-push: reuse existing is_null_ref
11816 match_refs: search ref list tail internally
11817 test-lib: fail if invalid options are passed
11818 test-lib: allow exit trap to be used for cleanup by tests
11819 test-lib: fix http exit codes
11822 Unify signedness in hashing calls
11824 Daniel Trstenjak (1):
11825 Show presence of stashed changes in bash prompt.
11828 mergetool--lib: specialize diff options for emerge and ecmerge
11829 mergetool--lib: add support for araxis merge
11830 compat: add a mkstemps() compatibility function
11831 compat: add a basename() compatibility function
11832 diff: generate pretty filenames in prep_temp_blob()
11834 Dirk Süsserott (1):
11835 gitk: Add option 'Simple history' to the options menu
11837 Edward Z. Yang (1):
11838 connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
11841 gitk: Make more options easily accessible from Edit View dialog
11843 Eric W. Biederman (1):
11844 git-send-email: Handle quotes when parsing .mailrc files
11847 git-svn: refuse to dcommit non-UTF-8 messages
11848 git-svn: convert globs to regexps for branch destinations
11849 t9138: remove stray dot in test which broke bash
11850 Allow the Unix epoch to be a valid commit date
11852 Eygene Ryabinkin (1):
11853 git-svn testsuite: use standard configuration for Subversion tools
11855 Felipe Contreras (2):
11856 Change prettify_ref to prettify_refname
11857 Prettify log decorations even more
11859 Frank Lichtenheld (2):
11860 Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
11861 Git.pm: Always set Repository to absolute path if autodetecting
11863 Giuseppe Bilotta (11):
11864 git-am foreign patch support: introduce patch_format
11865 git-am foreign patch support: autodetect some patch formats
11866 git-am foreign patch support: StGIT support
11867 git-am: refactor 'cleaning up and aborting'
11868 gitweb: refactor author name insertion
11869 gitweb: uniform author info for commit and commitdiff
11870 gitweb: use git_print_authorship_rows in 'tag' view too
11871 gitweb: (gr)avatar support
11872 gitweb: gravatar url cache
11873 gitweb: picon avatar provider
11874 gitweb: add empty alt text to avatar img
11877 Extend sample update hook, disable modifying of existing tags
11878 Extend sample pre-commit hook to check for non ascii filenames
11880 Hunter, D. Seth (1):
11881 http-push: fix xml_entities() string parsing overrun
11883 Jakub Narebski (10):
11884 gitweb: Remove function prototypes (cleanup)
11885 gitweb: Do not use bareword filehandles
11886 gitweb: Always use three argument form of open
11887 gitweb: Always use three argument form of open
11888 gitweb: Use block form of map/grep in a few cases more
11889 gitweb: Replace wrongly added tabs with spaces
11890 gitweb: Use capturing parentheses only when you intend to capture
11891 gitweb: Simplify snapshot format detection logic in evaluate_path_info
11892 gitweb: Remove unused $hash_base parameter from normalize_link_target
11893 gitweb: Sanitize title attribute in format_subject_html
11896 parseopt: add OPT_NEGBIT
11897 convert bare readlink to strbuf_readlink
11898 git-add: no need for -f when resolving a conflict in already tracked path
11899 Makefile: refactor regex compat support
11900 Makefile: use compat regex on Solaris
11901 log-tree: fix confusing comment
11902 Makefile: install 'git' in execdir
11905 post-receive-email: hooks.showrev: show how to include both web link and patch
11906 avoid NULL dereference on failed malloc
11909 Rename submodule.<name>.rebase to submodule.<name>.update
11910 git-submodule: add support for --merge.
11912 Johannes Schindelin (12):
11913 git-add: introduce --edit (to edit the diff vs. the index)
11914 t3702: fix reliance on SHELL_PATH being '/bin/sh'
11915 MinGW: the path separator to split GITPERLLIB is ';' on Win32
11916 MinGW: use POSIX signature of waitpid()
11917 MinGW: Add a simple getpass()
11918 MinGW: Fix compiler warning in merge-recursive
11919 MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
11920 Quiet make: do not leave Windows behind
11921 Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
11922 test-chmtime: work around Windows limitation
11923 MinGW: fix warning about implicit declaration of _getch()
11924 Fix warnings in nedmalloc when compiling with GCC 4.4.0
11926 Johannes Sixt (10):
11927 gitk: Use --textconv to generate diff text
11928 Simplify some instances of run_command() by using run_command_v_opt().
11929 Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
11930 Fix typo in nedmalloc warning fix
11931 compat/ has subdirectories: do not omit them in 'make clean'
11932 daemon: send stderr of service programs to the syslog
11933 upload-pack: squelch progress indicator if client cannot see it
11934 receive-pack: do not send error details to the client
11935 git-mv: fix directory separator treatment on Windows
11936 MinGW: truncate exit()'s argument to lowest 8 bits
11939 mktree --missing: updated usage message and man page
11940 mktree --batch: build more than one tree object
11941 mktree: validate entry type in input
11943 Junio C Hamano (22):
11944 Start 1.6.4 development
11945 build-in git-mktree
11946 mktree: use parse-options
11947 builtin-mktree.c: use a helper function to handle one line of input
11948 mktree: do not barf on a submodule commit
11949 t1010: add mktree test
11950 mktree --missing: allow missing objects
11951 t3900: ISO-2022-JP has more than one popular variants
11952 write-tree --ignore-cache-tree
11953 Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
11954 OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
11955 cache-tree.c::cache_tree_find(): simplify internal API
11956 t4007: modernize the style
11957 Optimize "diff-index --cached" using cache-tree
11958 Avoid "diff-index --cached" optimization under --find-copies-harder
11959 Update draft release notes to 1.6.4
11960 completion: fix PS1 display during an AM on detached HEAD
11961 Documentation/git.txt: update links to release notes
11962 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
11963 Makefile: test-parse-options depends on parse-options.h
11964 Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
11965 die_errno(): double % in strerror() output just in case
11968 symlinks.c: small style cleanup
11971 add --porcelain option to git-push
11973 Linus Torvalds (3):
11974 Clean up and simplify rev_compare_tree()
11975 Fix various sparse warnings in the git source code
11976 git log: add '--merges' flag to match '--no-merges'
11978 Marc Branchaud (3):
11979 git svn: Support multiple branch and tag paths in the svn repository.
11980 git svn: cleanup t9138-multiple-branches
11981 git svn: Doc update for multiple branch and tag paths
11983 Marius Storm-Olsen (2):
11984 MinGW readdir reimplementation to support d_type
11985 Add custom memory allocator to MinGW and MacOS builds
11988 git-svn: add --authors-prog option
11989 http.c: prompt for SSL client certificate password
11990 http.c: add http.sslCertPasswordProtected option
11992 Markus Heidelberg (10):
11993 show-branch: color the commit status signs
11994 bash completion: show-branch color support
11995 diff: do not color --stat output like patch context
11996 gitk: Allow diff view without context lines
11997 add a test for git-send-email for non-threaded mails
11998 send-email: fix non-threaded mails
11999 doc/send-email: clarify the behavior of --in-reply-to with --no-thread
12000 add a test for git-send-email for threaded mails without chain-reply-to
12001 send-email: fix threaded mails without chain-reply-to
12002 send-email: fix a typo in a comment
12005 Remove filename from conflict markers
12007 Michael J Gruber (9):
12008 Documentation: clarify / requirement in 'git check-ref-format'
12009 Test tracking of non-commit upstreams
12010 Fix behavior with non-commit upstream references
12011 Allow push and fetch urls to be different
12012 t5516: Check pushurl config setting
12013 technical/api-remote: Describe new struct remote member pushurl
12014 git-repack.txt: Clarify implications of -a for dumb protocols
12015 builtin-remote: Show push urls as well
12016 builtin-remote: Make "remote -v" display push urls
12018 Michael S. Tsirkin (1):
12019 Add --reference option to git submodule.
12021 Michael Witten (6):
12022 Docs: send-email: Put options back into alphabetical order
12023 Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
12024 Docs: send-email: --smtp-server-port can take symbolic ports
12025 send-email: Handle "GIT:" rather than "GIT: " during --compose
12026 send-email: 'References:' should only reference what is sent
12027 send-email: Remove superfluous `my $editor = ...'
12030 apply: handle filenames with double slashes better
12032 Michele Ballabio (1):
12033 gitk: Add another string to translation
12036 Don't expect verify_pack() callers to set pack_size
12037 transport.c::get_refs_via_curl(): do not leak refs_url
12038 http.c: new functions for the http API
12039 transport.c::get_refs_via_curl(): use the new http API
12040 http.c::http_fetch_ref(): use the new http API
12041 http-push.c::remote_exists(): use the new http API
12042 http-push.c::fetch_symref(): use the new http API
12044 Nguyễn Thái Ngọc Duy (3):
12045 doc/git-rebase.txt: remove mention of multiple strategies
12046 Terminate argv with NULL before calling setup_revisions()
12047 t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
12050 diff-tree -r -t: include added/removed directories in the output
12053 git-cvsexportcommit can't commit files which have been removed from CVS
12054 Remove archaic use of regex capture \1 in favour of $1
12055 Avoid generating a warning if $fullname{$file} is undefined
12058 Test cccmd in t9001-send-email.sh and fix some bugs
12061 gitk: Handle msysGit version during version comparisons
12062 git: browsing paths with spaces when using the start command
12064 Paul Mackerras (1):
12065 gitk: Check git version before using --textconv flag
12068 MinGW: Scan for \r in addition to \n when reading shbang lines
12070 Peter Hutterer (1):
12071 git-submodule: add support for --rebase.
12073 Pierre Habouzit (1):
12074 parse-options: add parse_options_check to validate option specs.
12076 Ralf Wildenhues (1):
12077 configure: test whether -lresolv is needed
12080 parseopt: add OPT_NEGBIT
12081 parseopt: add OPT_NUMBER_CALLBACK
12082 parseopt: add PARSE_OPT_NODASH
12083 grep: remove global variable builtin_grep
12085 grep: make callback functions static
12086 userdiff: add xdiff_clear_find_func()
12087 grep: move context hunk mark handling into show_line()
12088 grep: print context hunk marks between files
12089 grep: handle pre context lines on demand
12090 grep: add option -p/--show-function
12091 grep -p: support user defined regular expressions
12092 grep: simplify -p output
12094 Robin Rosenberg (1):
12095 Disallow '\' in ref names
12098 bash: remove always true if statement from __git_ps1()
12099 Documentation: mention 'git stash pop --index' option explicitly
12100 bash: add support for 'git stash pop --index' option
12103 parse-remote: function to get the tracking branch to be merge
12104 parse-remote: support default reflist in get_remote_merge_branch
12105 parse-remote: remove unused functions
12107 Sitaram Chamarty (1):
12108 allow -t abbreviation for --track in git branch
12110 Steffen Prohaska (1):
12111 MinGW: Teach Makefile to detect msysgit and apply specific settings
12114 bash completion: complete variable names for "git config" with options
12115 format-patch: migrate to parse-options API
12116 parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
12117 show-branch: migrate to parse-options API
12118 parse-opts: prepare for OPT_FILENAME
12119 parse-opts: add OPT_FILENAME and transition builtins
12120 t5500: Modernize test style
12121 t9120: don't expect failure with SVN_HTTPD_PORT unset
12122 config.txt: document add.ignore-errors
12123 git-show-branch.txt: document --date-order option
12124 parse-options: make OPT_INTEGER's argh explicit
12125 parse-options: simplify usage argh handling
12126 show-branch: don't use LASTARG_DEFAULT with OPTARG
12127 t4150: test applying with a newline in subject
12128 am: suppress apply errors when using 3-way
12129 git-sh-setup: introduce say() for quiet options
12130 submodule, repack: migrate to git-sh-setup's say()
12131 am, rebase: teach quiet option
12132 stash: teach quiet option
12133 show-ref: migrate to parse-options
12134 completion: add missing config variables
12135 completion: __git_config_get_set_variables() handle values with spaces
12137 Tay Ray Chuan (15):
12138 t5540-http-push: test fetching of loose objects
12139 t5540-http-push: test fetching of packed objects
12140 http-push: send out fetch requests on queue
12141 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
12142 t5550-http-fetch: test fetching of packed objects
12143 http-push, http-walker: style fixes
12144 http-walker: verify remote packs
12145 http*: copy string returned by sha1_to_hex
12146 http-push: do not SEGV after fetching a bad pack idx file
12147 http*: move common variables and macros to http.[ch]
12148 http: create function end_url_with_slash
12149 http*: add http_get_info_packs
12150 http: use new http API in fetch_index()
12151 http*: add helper methods for fetching packs
12152 http*: add helper methods for fetching objects (loose)
12155 Documentation: teach stash/pop workflow instead of stash/apply
12156 git-svn: let 'dcommit $rev' work on $rev instead of HEAD
12157 Introduce die_errno() that appends strerror(errno) to die()
12158 Convert existing die(..., strerror(errno)) to die_errno()
12159 Use die_errno() instead of die() when checking syscalls
12161 Todd Zullinger (1):
12162 completion: Add --full-diff to log options
12165 send-email: Add config option for sender address
12168 git-svn: Canonicalize svn urls to prevent libsvn assertion
12170 Uwe Kleine-König (2):
12171 more tests for git rev-parse --parse-opt
12172 parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
12175 git-svn.txt: stop using dash-form of commands.
12176 git-svn.txt: make formatting more consistent.
12177 git-svn.txt: fix fetch flags incorrectly documented as init flags.
12178 git-svn.txt: fix description of fetch flags accepted by clone.
12181 Version v1.6.3.4; changes since v1.6.3.3:
12182 -----------------------------------------
12185 refs.c: release file descriptor on error return
12186 sha1_name.c: avoid unnecessary strbuf_release
12189 git-remote: fix missing .uploadpack usage for show command
12191 Clemens Buchacher (1):
12192 fetch: do not create ref from empty name
12194 Giuseppe Bilotta (1):
12195 gitweb/README: fix AliasMatch in example
12198 t3700-add: add a POSIXPERM prerequisite to a new test
12199 Makefile: git.o depends on library headers
12201 Junio C Hamano (9):
12202 request-pull: really disable pager
12203 checkout -f: deal with a D/F conflict entry correctly
12204 combine-diff.c: fix performance problem when folding common deleted lines
12205 diff --cc: a lost line at the beginning of the file is shown incorrectly
12206 do_one_ref(): null_sha1 check is not about broken ref
12207 SunOS grep does not understand -C<n> nor -e
12208 Fix severe breakage in "git-apply --whitespace=fix"
12209 t8005: Nobody writes Russian in shift_jis
12212 Linus Torvalds (3):
12213 git branch: fix performance problem
12214 git branch: avoid unnecessary object lookups
12215 git branch: clean up detached branch handling
12217 Matthias Andree (1):
12218 Fix export_marks() error handling.
12221 request-pull: really really disable pager
12224 git-submodule documentation: fix foreach example
12227 attr: plug minor memory leak
12230 fread does not return negative on error
12233 Trailing whitespace and no newline fix
12235 Sitaram Chamarty (1):
12236 Documentation: update description of shell aliases
12239 add: allow configurations to be overriden by command line
12240 config.txt: document add.ignore-errors
12242 Thadeu Lima de Souza Cascardo (1):
12243 Makes some cleanup/review in gittutorial
12246 Test git archive --remote
12247 Test grep --and/--or/--not
12250 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
12253 Version v1.6.3.3; changes since v1.6.3.2:
12254 -----------------------------------------
12256 Anders Kaseorg (1):
12257 for-each-ref: Do not lookup objects when they will not be used
12259 Clemens Buchacher (1):
12260 refuse to merge during a merge
12263 use xstrdup, not strdup in ll-merge.c
12265 Johannes Schindelin (1):
12266 import-tars: support symlinks
12269 fetch-pack: close output channel after sideband demultiplexer terminates
12270 diff.c: plug a memory leak in an error path
12272 Junio C Hamano (3):
12273 t3505: fix abuse of test_expect_code
12274 attribute: whitespace set to true detects all errors known to git
12277 Linus Torvalds (1):
12278 Fix big left-shifts of unsigned char
12280 Marco Nelissen (1):
12281 fix handling of iconv configuration options
12284 http.c: fix compiling with libcurl 7.9.2
12286 Michael J Gruber (1):
12287 builtin-remote: Make "remote show" display all urls
12290 git-svn documentation: fix typo in 'rebase vs. pull/merge' section
12292 Nanako Shiraishi (1):
12293 .gitattributes: CR at the end of the line is an error
12296 Documentation: git-send-mail can take rev-list arg to drive format-patch
12297 avoid exponential regex match for java and objc function names
12300 upload-archive: fix infinite loop on Cygwin
12302 Shawn O. Pearce (1):
12303 daemon: Strictly parse the "extra arg" part of the command
12306 git-rerere.txt: grammatical fixups and cleanups
12307 pull, rebase: simplify to use die()
12308 git-show-ref.txt: remove word and make consistent
12311 http*: cleanup slot->local after fclose
12314 Documentation: refer to gitworkflows(7) from tutorial and git(1)
12316 Uwe Kleine-König (1):
12317 rebase--interactive: remote stray closing parenthesis
12320 Version v1.6.3.2; changes since v1.6.3.1:
12321 -----------------------------------------
12324 Introduce an unlink(2) wrapper which gives warning if unlink failed
12325 replace direct calls to unlink(2) with unlink_or_warn
12326 print unlink(2) errno in copy_or_link_directory
12327 Clarify kind of conflict in merge-one-file helper
12328 ls-tree manpage: use "unless" instead of "when ... is not"
12329 ls-tree manpage: output of ls-tree is compatible with update-index
12330 http-push.c::remove_locks(): fix use after free
12332 Charles Bailey (2):
12333 t6023: merge-file fails to output anything for a degenerate merge
12334 Change xdl_merge to generate output even for null merges
12336 Clemens Buchacher (1):
12337 fix segfault showing an empty remote
12340 Fix type-punning issues
12342 Daniel Cordero (1):
12343 builtin-checkout: Don't tell user that HEAD has moved before it has
12345 Dave Olszewski (1):
12346 merge-recursive: never leave index unmerged while recursing
12348 Giuseppe Bilotta (1):
12349 completion: use git rev-parse to detect bare repos
12352 fix GIT_TRACE segfault with shell-quoted aliases
12353 add: don't complain when adding empty project root
12354 for-each-ref: fix segfault in copy_email
12355 lock_ref: inform callers of unavailable ref
12356 fetch: report ref storage DF errors more accurately
12357 fix cat-file usage message and documentation
12360 format-patch let -k override a config-specified format.numbered
12361 pre-commit.sample: don't print incidental SHA1
12363 Johannes Schindelin (2):
12364 Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
12365 Cope better with a _lot_ of packs
12368 t3701: ensure correctly set up repository after skipped tests
12370 Junio C Hamano (8):
12371 Revert "git-add--interactive: remove hunk coalescing"
12372 completion: fix PS1 display during a merge on detached HEAD
12373 completion: simplify "current branch" in __git_ps1()
12374 completion: enhance "current branch" display
12375 Prepare for 1.6.3.2
12376 Update draft release notes for 1.6.3.2
12377 blame: correctly handle a path that used to be a directory
12380 Linus Torvalds (3):
12381 Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
12382 Teach 'git checkout' to preload the index contents
12383 dir.c: clean up handling of 'path' parameter in read_directory_recursive()
12386 Splitting a hunk that adds a line at the top fails in "add -p"
12388 Michael J Gruber (1):
12389 merge-options.txt: Clarify merge --squash
12391 Nanako Shiraishi (1):
12392 test: checkout shouldn't say that HEAD has moved if it didn't
12395 allow OFS_DELTA objects during a push
12398 grep: fix word-regexp colouring
12399 grep: fix word-regexp at the beginning of lines
12400 grep: fix colouring of matches with zero length
12401 grep: fix empty word-regexp matches
12404 api-parse-options.txt: use 'func' instead of 'funct'
12405 tests: Add tests for missing format-patch long options
12406 completion: add missing options to show-branch and show
12407 show-branch: Fix die message in parse_reflog_param()
12408 commit: -F overrides -t
12409 apply, fmt-merge-msg: use relative filenames
12412 Documentation: teach stash/pop workflow instead of stash/apply
12413 add -i: do not dump patch during application
12416 Turn on USE_ST_TIMESPEC for OpenBSD
12419 Version v1.6.3.1; changes since v1.6.3:
12420 ---------------------------------------
12423 Clarify kind of conflict in merge-one-file helper
12425 Alexander Potashev (1):
12426 Documentation: cloning to empty directory is allowed
12428 Felipe Contreras (1):
12429 git config: clarify --add and --get-color
12431 Junio C Hamano (4):
12432 Start 1.6.3.1 maintenance series.
12433 archive-tar.c: squelch a type mismatch warning
12434 Revert "checkout branch: prime cache-tree fully"
12438 Version v1.6.3; changes since v1.6.3-rc4:
12439 -----------------------------------------
12442 improve error message in config.c
12445 dir.c: Fix two minor grammatical errors in comments
12448 Work around BSD whose typeof(tv.tv_sec) != time_t
12451 t4018-diff-funcname: add cpp xfuncname pattern to syntax test
12452 t8005: use egrep when extended regular expressions are required
12453 t4118: add missing '&&'
12454 t4118: avoid sed invocation on file without terminating newline
12455 t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
12456 t4200: remove two unnecessary lines
12457 t4200: convert sed expression which operates on non-text file to perl
12459 Junio C Hamano (4):
12462 git-clean doc: the command only affects paths under $(cwd)
12465 Nguyễn Thái Ngọc Duy (1):
12466 t4029: use sh instead of bash
12469 honor repack.usedeltabaseoffset when fetching packs
12471 Robin H. Johnson (1):
12472 git-svn: fix a sloppy Getopt::Long usage
12475 completion: add missing configuration variables to _git_config()
12476 completion: add {gui,diff,merge}tool, man, and pager config variables
12477 completion: complete values for help.format
12478 completion: complete values for log.date
12479 completion: complete values for send-email
12480 git-am.txt: add an 'a', say what 'it' is, simplify a sentence
12481 git-am.txt: Use date or value instead of time or timestamp
12482 git-am.txt: reword extra headers in message body
12485 Version v1.6.3-rc4; changes since v1.6.3-rc3:
12486 ---------------------------------------------
12489 git-gui: Update Russian translation
12490 improve error message in config.c
12491 gitk: Add Russian translation
12493 Alexander Gavrilov (3):
12494 git-gui: Fix post-commit status with subject in non-locale encoding
12495 git-gui: Avoid an infinite rescan loop in handle_empty_diff.
12496 git-gui: Support more git version notations.
12499 builtin-merge: fix a typo in an error message
12500 Documentation: fix a grammatical error in api-builtin.txt
12502 Benjamin Kramer (1):
12503 daemon.c: fix segfault on OS X
12505 Christian Stimming (1):
12506 gitk: Mark forgotten string for translation
12508 Daniel A. Steffen (2):
12509 gitk: Fixes for Mac OS X TkAqua
12510 git-gui: Fixes for Mac OS X TkAqua
12513 Makefile: installing git in cygwin 1.7.0
12514 doc: consistently use ASCIIDOC_EXTRA
12516 Felipe Contreras (2):
12517 git config: error when editing a repo config and not being in one
12518 Fix a bunch of pointer declarations (codestyle)
12521 git-gui: Ensure consistent usage of mergetool.keepBackup
12523 Giuseppe Bilotta (1):
12524 gitk: Provide a window icon if possible
12527 Makefile: fix NO_PERL bug with gitweb
12530 git-gui: Fix merge conflict display error when filename contains spaces
12531 git-gui: When calling post-commit hook wrong variable was cleared.
12532 git-gui: run post-checkout hook on checkout
12533 git-gui: run post-checkout hook after clone
12535 Joerg Bornemann (1):
12536 git-gui: fix use of undeclared variable diff_empty_count
12538 Johannes Schindelin (2):
12539 t5701: do not get stuck in empty-push/
12540 Rename core.unreliableHardlinks to core.createObject
12543 prune-packed: advanced progress even for non-existing fan-out directories
12545 Junio C Hamano (3):
12546 diff -c -p: do not die on submodules
12547 merge-recursive: do not die on a conflicting submodule
12550 Linus Torvalds (1):
12551 grep: fix segfault when "git grep '('" is given
12554 Add semicolon to curly brace group in main Makefile
12556 Markus Heidelberg (5):
12557 git-gui: don't hide the Browse button when resizing the repo chooser
12558 git-gui: fix deleting from the context menu with empty selection
12559 git-gui: use `git --html-path` to get the location of installed HTML docs
12560 git-gui (Win): make "Explore Working Copy" more robust
12561 git-gui (Win): make starting via "Git GUI Here" on .git/ possible
12563 Michele Ballabio (2):
12564 gitk: Mark some more strings for translation
12565 gitk: Map KP_Divide to focus the search box
12568 gitk: Handle blobs containing a DOS end-of-file marker
12569 gitk: Remember and restore the window state with the geometry
12570 gitk: Handle external diff tool with spaces in the path
12571 gitk: Avoid crash if closed while reading references
12573 Patrick Welche (1):
12574 NetBSD compilation fix
12576 Paul Mackerras (4):
12577 gitk: Add a way to mark a commit, plus a "find descendant" command
12578 gitk: Add a command to compare two strings of commits
12579 gitk: Make .gitk a hidden file under windows
12580 gitk: Fix compare-commits function when we have local changes
12583 Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
12586 ctype.c: fix typo in comment
12589 git-gui: various French translation fixes
12590 git-gui: minor spelling fix and string factorisation.
12593 SubmittingPatches: itemize and reflect upon well written changes
12596 gitk: Provide a 32x32 window icon based on the git logo
12598 Uwe Kleine-König (1):
12599 parseopt: fix documentation for --keep-dashdash
12602 Version v1.6.3-rc3; changes since v1.6.3-rc2:
12603 ---------------------------------------------
12605 Benjamin Kramer (1):
12606 connect: replace inet_ntop with getnameinfo
12609 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
12610 t7700-repack: repack -a now works properly, expect success from test
12612 Johannes Schindelin (1):
12613 Add an option not to use link(src, dest) && unlink(src) when that is unreliable
12615 Linus Torvalds (1):
12619 progress bar: round to the nearest instead of truncating down
12621 Sitaram Chamarty (1):
12622 Remove obsolete bug warning in man git-update-server-info
12624 Wesley J. Landaker (2):
12625 Documentation: git-clean: fix minor grammatical errors
12626 Documentation: git-clean: make description more readable
12629 Version v1.6.3-rc2; changes since v1.6.3-rc1:
12630 ---------------------------------------------
12633 Wait for git diff to finish in git difftool
12634 Explain seemingly pointless use of system in difftool
12637 t4202-log: extend test coverage of graphing
12638 graph API: fix extra space during pre_commit_line state
12639 graph API: fix a bug in the rendering of octopus merges
12642 Work around ash "alternate value" expansion bug
12644 Bill Pemberton (1):
12645 Add parsing of elm aliases to git-send-email
12647 Dan Loewenherz (1):
12648 Convert to use quiet option when available
12650 Erik Faye-Lund (4):
12651 test-suite: adding a test for fast-export with tag variants
12652 builtin-fast-export.c: turn error into warning
12653 builtin-fast-export.c: fix crash on tagged trees
12654 builtin-fast-export.c: handle nested tags
12656 Frank Lichtenheld (1):
12657 gitcvs-migration: Link to git-cvsimport documentation
12660 gitweb: Fix snapshots requested via PATH_INFO
12663 add-interactive: refactor mode hunk handling
12664 t7800: respect NO_PERL
12667 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
12669 Johannes Schindelin (1):
12670 Fix off-by-one in read_tree_recursive
12673 Windows: Work around intermittent failures in mingw_rename
12674 Windows: Skip fstat/lstat optimization in write_entry()
12675 builtin-help: silently tolerate unknown keys
12676 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
12678 Junio C Hamano (9):
12679 Speed up reflog pruning of unreachable commits
12681 read-tree A B: do not corrupt cache-tree
12682 Move prime_cache_tree() to cache-tree.c
12683 read-tree -m A B: prime cache-tree from the switched-to tree
12684 checkout branch: prime cache-tree fully
12685 Revert "stat_tracking_info(): only count real commits"
12686 Makefile: ignore perl/ subdirectory under NO_PERL
12689 Linus Torvalds (1):
12690 Clean up reflog unreachability pruning decision
12692 Markus Heidelberg (1):
12693 grep: don't support "grep.color"-like config options
12696 git add -p: new "quit" command at the prompt.
12697 Update git-add.txt according to the new possibilities of 'git add -p'.
12698 clone: add test for push on an empty clone.
12700 Michael J Gruber (2):
12701 test-lib.sh: Help test_create_repo() find the templates dir
12702 Fix more typos/spelling in comments
12704 Michał Kiedrowicz (3):
12705 tests: test applying criss-cross rename patch
12706 builtin-apply: keep information about files to be deleted
12707 tests: make test-apply-criss-cross-rename more robust
12710 builtin-remote: fix typo in option description
12711 Documentation: fix typos / spelling mistakes
12712 Fix typos / spelling in comments
12714 Nguyễn Thái Ngọc Duy (1):
12715 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
12718 test-genrandom: Add newline to usage string
12719 config.txt: add missing format.{subjectprefix,cc,attach} variables
12720 Documentation: use lowercase for shallow and deep threading
12721 git-show-branch.txt: cleanup example description
12722 git-format-patch.txt: general rewordings and cleanups
12723 config.txt: add missing 'the's and make words plural
12724 config.txt: clarify sentences in the configuration and syntax sections
12725 config.txt: Make configuration paragraph more consistent
12727 Wesley J. Landaker (2):
12728 Documentation: git-svn: fix spurious bolding that mangles the output
12729 Documentation: git-svn: fix a grammatical error without awkwardness
12731 Wincent Colaiuta (1):
12732 git add -p: add missing "q" to patch prompt
12735 Version v1.6.3-rc1; changes since v1.6.3-rc0:
12736 ---------------------------------------------
12739 graph API: Added logic for colored edges
12742 shorten_unambiguous_ref(): add strict mode
12743 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
12744 rev-parse: --abbrev-ref option to shorten ref name
12746 David Aguilar (11):
12747 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
12748 difftool: remove the backup file feature
12749 difftool: use perl built-ins when testing for msys
12750 difftool: add a -y shortcut for --no-prompt
12751 difftool: move 'git-difftool' out of contrib
12752 difftool: add various git-difftool tests
12753 difftool: add support for a difftool.prompt config variable
12754 bash completion: add git-difftool
12755 mergetool: use $( ... ) instead of `backticks`
12756 difftool/mergetool: refactor commands to use git-mergetool--lib
12757 mergetool--lib: simplify API usage by removing more global variables
12760 git-shell: Add 'git-upload-archive' to allowed commands.
12763 Fix misspelled mergetool.keepBackup
12765 Frank Lichtenheld (1):
12766 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
12769 doc: clarify --no-track option
12770 doc: refer to tracking configuration as "upstream"
12771 doc/checkout: refer to git-branch(1) as appropriate
12772 doc/checkout: split checkout and branch creation in synopsis
12773 docs/checkout: clarify what "non-branch" means
12774 add-interactive: refactor mode hunk handling
12775 doc/gitattributes: clarify location of config text
12778 t1301-shared-repo: fix forced modes test
12780 Junio C Hamano (4):
12781 gitignore git-bisect--helper
12782 unpack-trees: do not muck with attributes when we are not checking out
12783 Describe fixes since 1.6.2.3
12784 Update draft release notes to 1.6.3
12786 Linus Torvalds (3):
12787 Allow users to un-configure rename detection
12788 process_{tree,blob}: show objects without buffering
12789 show_object(): push path_name() call further down
12791 Markus Heidelberg (5):
12792 doc/merge-config: list ecmerge as a built-in merge tool
12793 git-mergetool/difftool: make (g)vimdiff workable under Windows
12794 git-mergetool: add new merge tool TortoiseMerge
12795 doc/git-daemon: add missing arguments to options
12796 doc/git-daemon: add missing arguments to max-connections option
12799 git add -p: new "quit" command at the prompt.
12800 Update git-add.txt according to the new possibilities of 'git add -p'.
12802 Michael J Gruber (1):
12803 remote.c: use shorten_unambiguous_ref
12805 Michał Kiedrowicz (3):
12806 tests: test applying criss-cross rename patch
12807 builtin-apply: keep information about files to be deleted
12808 Documentation: boolean value may be given by on/off
12810 Nanako Shiraishi (1):
12811 git-am: teach git-am to apply a patch to an unborn branch
12813 Nguyễn Thái Ngọc Duy (3):
12814 get_local_heads(): do not return random pointer if there is no head
12815 attr: add GIT_ATTR_INDEX "direction"
12816 archive: do not read .gitattributes in working directory
12819 imap-send: use correct configuration variable in documentation
12821 Pierre Habouzit (1):
12822 hook/update: example of how to prevent branch creation
12825 archive tests: do not use .gitattributes in working directory
12826 archive test: attributes
12828 Sebastian Pipping (1):
12829 difftool/mergetool: add diffuse as merge and diff tool
12831 Thomas Jarosch (1):
12832 Fix buffer overflow in config parser
12835 git-apply: fix option description
12838 Version v1.6.3-rc0; changes since v1.6.2.5:
12839 -------------------------------------------
12842 disable post-checkout test on Cygwin
12843 Produce a nicer output in case of sha1_object_info failures in ls-tree -l
12844 Microoptimize strbuf_cmp
12845 Improve error message about fetch into current branch
12847 Ali Gholami Rudi (2):
12848 builtin-clone.c: make junk_pid static
12849 builtin-clone.c: no need to strdup for setenv
12852 Do not name "repo" struct "remote" in push_http.c
12853 http-push.c: use a faux remote to pass to http_init
12855 Arjen Laarhoven (2):
12856 Clean up use of ANSI color sequences
12857 builtin-branch.c: Rename branch category color names
12860 bash completion: add options for 'git fsck'
12863 git-svn: Add per-svn-remote ignore-paths config
12864 git-svn: Save init/clone --ignore-paths in config
12867 configure: ensure settings from user are also usable in the script
12868 configure: reorganize flow of argument checks
12869 configure: add macros to stash FLAG variables
12870 configure: wrap some library tests with GIT_STASH_FLAGS
12871 configure: asciidoc version test cleanup
12872 configure: make iconv tests aware of user arguments
12873 configure: rework pthread handling to allow for user defined flags
12874 documentation: Makefile accounts for SHELL_PATH setting
12876 Benjamin Kramer (4):
12877 Remove unused function scope local variables
12878 Move local variables to narrower scopes
12879 Remove unused assignments
12880 Fix various dead stores found by the clang static analyzer
12882 Björn Steinbrink (1):
12883 Mailmap: Allow empty email addresses to be mapped
12886 git-svn: speed up blame command
12889 builtin-send-pack.c: avoid empty structure initialization
12891 Brian Gernhardt (2):
12892 Create USE_ST_TIMESPEC and turn it on for Darwin
12893 Makefile: Set compiler switch for USE_NSEC
12895 Carlos Manuel Duclos Vergara (1):
12896 git-archive: add --output=<file> to send output to a file
12899 config: test for --replace-all with one argument and fix documentation.
12901 Chris Johnsen (13):
12902 git-push.txt: describe how to default to pushing only current branch
12903 Documentation: remove extra quoting/emphasis around literal texts
12904 Documentation/Makefile: make most operations "quiet"
12905 Documentation/Makefile: break up texi pipeline
12906 Documentation: move callouts.xsl to manpage-{base,normal}.xsl
12907 Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl
12908 Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
12909 Documentation: move quieting params into manpage-base.xsl
12910 Documentation: move "spurious .sp" code into manpage-base.xsl
12911 Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
12912 Documentation: asciidoc.conf: fix verse block with block titles
12913 Documentation: option to render literal text as bold for manpages
12914 Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
12916 Christian Couder (24):
12917 rev-list: estimate number of bisection step left
12918 log-tree: fix patch filename computation in "git format-patch"
12919 quote: implement "sq_dequote_many" to unwrap many args in one string
12920 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
12921 refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
12922 rev-list: make "bisect_list" variable local to "cmd_rev_list"
12923 rev-list: move bisect related code into its own file
12924 rev-list: move code to show bisect vars into its own function
12925 rev-list: make "show_bisect_vars" non static
12926 rev-list: pass "revs" to "show_bisect_vars"
12927 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
12928 patch-ids: use the new generic "sha1_pos" function to lookup sha1
12929 bisect: improve error message when branch checkout fails
12930 rev-list: call new "filter_skip" function
12931 bisect: use the new generic "sha1_pos" function to lookup sha1
12932 bisect--helper: implement "git bisect--helper"
12933 bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
12934 bisect: use "bisect--helper" and remove "filter_skipped" function
12935 t6030: test bisecting with paths
12936 rev-list: pass "int flags" as last argument of "show_bisect_vars"
12937 bisect--helper: string output variables together with "&&"
12938 list-objects: add "void *data" parameter to show functions
12939 rev-list: remove last static vars used in "show_commit"
12940 rev-list: add "int bisect_show_flags" in "struct rev_list_info"
12943 Update delta compression message to be less misleading
12945 Daniel Barkalow (8):
12946 Make clone parse the default refspec with the normal code
12947 Use a single function to match names against patterns
12948 Use the matching function to generate the match results
12949 Keep '*' in pattern refspecs
12950 Support '*' in the middle of a refspec
12951 Use a common function to get the pretty name of refs
12952 Move push matching and reporting logic into transport.c
12953 Include log_config module in apache.conf
12956 contrib/difftool: use a separate config namespace for difftool commands
12959 add -i: revisit hunk on editor failure
12962 git-filter-branch: avoid collisions with variables in eval'ed commands
12963 Correct missing SP characters in grammar comment at top of fast-import.c
12964 fast-export: Avoid dropping files from commits
12967 config.txt: Describe special 'none' handling in core.gitProxy.
12970 git-svn: fix ls-tree usage with dash-prefixed paths
12972 Erik Faye-Lund (5):
12973 connect.c: remove a few globals by using git_config callback data
12974 test-suite: adding a test for fast-export with tag variants
12975 builtin-fast-export.c: turn error into warning
12976 builtin-fast-export.c: fix crash on tagged trees
12977 builtin-fast-export.c: handle nested tags
12979 Eugene Letuchy (1):
12980 Make git blame's date output format configurable, like git log
12982 Felipe Contreras (14):
12983 config: Add new option to open an editor.
12984 git config: codestyle cleanups
12985 git_config(): not having a per-repo config file is not an error
12986 git config: trivial rename in preparation for parseopt
12987 git config: reorganize get_color*
12988 git config: reorganize to use parseopt
12989 git config: don't allow multiple config file locations
12990 git config: don't allow multiple variable types
12991 git config: don't allow extra arguments for -e or -l.
12992 git config: don't allow --get-color* and variable type
12993 Add tests for git log --pretty, --format and --oneline.
12994 user-manual: remove some git-foo usage
12995 docbook: change css style
12996 user-manual: the name of the hash function is SHA-1, not sha1
12998 Finn Arne Gangstad (7):
12999 New config push.default to decide default behavior for push
13000 Display warning for default git push with no push.default config
13001 builtin-remote.c: Split out prune_remote as a separate function.
13002 git remote update: New option --prune
13003 git remote update: Report error for non-existing groups
13004 remote: New function remote_is_configured()
13005 git remote update: Fallback to remote if group does not exist
13007 Giuseppe Bilotta (1):
13008 import-tars: separate author from committer
13011 Add warning about known issues to documentation of cvsimport
13012 Cleanup warning about known issues in cvsimport documentation
13013 Add configuration variable for sign-off to format-patch
13016 MinGW: implement mmap
13019 git-svn: add fetch --parent option
13022 builtin-branch: improve output when displaying remote branches
13023 move duplicated get_local_heads() to remote.c
13024 move duplicated ref_newer() to remote.c
13025 move locate_head() to remote.c
13026 remote: simplify guess_remote_head()
13027 remote: make copy_ref() perform a deep copy
13028 remote: let guess_remote_head() optionally return all matches
13029 remote: make match_refs() copy src ref before assigning to peer_ref
13030 remote: make match_refs() not short-circuit
13031 string-list: new for_each_string_list() function
13032 builtin-remote: refactor duplicated cleanup code
13033 builtin-remote: remove unused code in get_ref_states
13034 builtin-remote: rename variables and eliminate redundant function call
13035 builtin-remote: make get_remote_ref_states() always populate states.tracked
13036 builtin-remote: fix two inconsistencies in the output of "show <remote>"
13037 builtin-remote: teach show to display remote HEAD
13038 builtin-remote: add set-head subcommand
13039 builtin-remote: new show output style
13040 builtin-remote: new show output style for push refspecs
13041 send-email: add --confirm option and configuration setting
13042 bash completion: fix completion issues with fetch, pull, and push
13043 bash completion: refactor --strategy completion
13044 bash completion: teach fetch, pull, and push to complete their options
13045 send-email: refactor and ensure prompting doesn't loop forever
13046 send-email: add tests for refactored prompting
13047 send-email: don't attempt to prompt if tty is closed
13048 send-email: ask_default should apply to all emails, not just the first
13049 send-email: correct two tests which were going interactive
13050 send-email: ensure quoted addresses are rfc2047 encoded
13051 send-email: fix nasty bug in ask() function
13054 valgrind: ignore ldso and more libz errors
13055 branch: clean up repeated strlen
13056 add basic branch display tests
13057 test scripts: refactor start_httpd helper
13058 add basic http clone/fetch tests
13059 refactor find_ref_by_name() to accept const list
13060 remote: make guess_remote_head() use exact HEAD lookup if it is available
13061 clone: run post-checkout hook when checking out
13062 improve missing repository error message
13063 config: set help text for --bool-or-int
13064 t3000: use test_cmp instead of diff
13065 ls-files: fix broken --no-empty-directory
13066 ls-files: require worktree when --deleted is given
13067 make oneline reflog dates more consistent with multiline format
13068 remote: improve sorting of "configure for git push" list
13069 Makefile: turn on USE_ST_TIMESPEC for FreeBSD
13070 t0060: fix whitespace in "wc -c" invocation
13071 tests: remove exit after test_done call
13072 for-each-ref: refactor get_short_ref function
13073 for-each-ref: refactor refname handling
13074 for-each-ref: add "upstream" format field
13075 make get_short_ref a public function
13076 branch: show upstream branch when double verbose
13077 Makefile: allow building without perl
13078 tests: skip perl tests if NO_PERL is defined
13079 add tests for remote groups
13082 githooks documentation: post-checkout hook is also called after clone
13085 Enable setting attach as the default in .gitconfig for git-format-patch.
13086 imap.preformattedHTML to tell Thunderbird to send non-flowed text
13088 Johannes Schindelin (23):
13089 Add valgrind support in test scripts
13090 Valgrind support: check for more than just programming errors
13091 test-lib.sh: optionally output to test-results/$TEST.out, too
13092 t/Makefile: provide a 'valgrind' target
13093 Add a script to coalesce the valgrind outputs
13094 Tests: let --valgrind imply --verbose and --tee
13095 test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
13096 valgrind: do not require valgrind 3.4.0 or newer
13097 Avoid segfault with 'git branch' when the HEAD is detached
13098 Turn the flags in struct dir_struct into a single variable
13099 git config: trivial cleanup for editor action
13100 rebase -i: avoid 'git reset' when possible
13101 MinGW: 64-bit file offsets
13102 Brown paper bag fix for MinGW 64-bit stat
13103 Add an (optional, since expensive) test for >2gb clones
13104 MinGW: fix diff --no-index /dev/null ...
13105 winansi: support ESC [ K (erase in line)
13106 test: do not LoadModule log_config_module unconditionally
13107 test-lib: write test results to test-results/<basename>-<pid>
13108 gc --aggressive: make it really aggressive
13109 t7300: fix clean up on Windows
13110 Guard a few Makefile variables against user environments
13111 git-svn: always initialize with core.autocrlf=false
13113 Johannes Sixt (30):
13114 recv_sideband: Bands #2 and #3 always go to stderr
13115 test-suite: Make test script numbers unique
13116 t9400, t9401: Do not force hard-linked clone
13117 test suite: Use 'say' to say something instead of 'test_expect_success'
13118 Call 'say' outside test_expect_success
13119 test-lib: Replace uses of $(expr ...) by POSIX shell features.
13120 test-lib: Simplify test counting.
13121 test-lib: Introduce test_chmod and use it instead of update-index --chmod
13122 t2200, t7004: Avoid glob pattern that also matches files
13123 t5300, t5302, t5303: Do not use /dev/zero
13124 t5602: Work around path mangling on MSYS
13125 test-lib: Work around incompatible sort and find on Windows
13126 test-lib: Work around missing sum on Windows
13127 Tests on Windows: $(pwd) must return Windows-style paths
13128 t0050: Check whether git init detected symbolic link support correctly
13129 test-lib: Infrastructure to test and check for prerequisites
13130 t3600: Use test prerequisite tags
13131 Skip tests that fail if the executable bit is not handled by the filesystem
13132 t5302: Use prerequisite tags to skip 64-bit offset tests
13133 t9100, t9129: Use prerequisite tags for UTF-8 tests
13134 Use prerequisite tags to skip tests that depend on symbolic links
13135 t0060: Fix tests on Windows
13136 Skip tests that require a filesystem that obeys POSIX permissions
13137 t3700: Skip a test with backslashes in pathspec
13138 Use prerequisites to skip tests that need unzip
13139 t7004: Use prerequisite tags to skip tests that need gpg
13140 t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
13141 MinGW: Quote arguments for subprocesses that contain a single-quote
13142 t7005-editor: Use $SHELL_PATH in the editor scripts
13143 t7502-commit: Skip SIGTERM test on Windows
13146 Modify description file to say what this file is
13147 Google has renamed the imap folder
13148 Improve error message for git-filter-branch
13149 Documentation - More examples for git bisect
13151 Junio C Hamano (29):
13152 git-blame: refactor code to emit "porcelain format" output
13153 blame: show "previous" information in --porcelain/--incremental format
13154 Make git-clone respect branch.autosetuprebase
13155 Draft release notes: Carry forward the warning for behaviour changes
13156 Update draft release notes to 1.6.3
13157 builtin-remote.c: no "commented out" code, please
13158 Not all systems use st_[cm]tim field for ns resolution file timestamp
13159 grep: cast printf %.*s "precision" argument explicitly to int
13160 http.c: style cleanups
13161 Improve "git branch --tracking" output
13162 http_init(): Fix config file parsing
13163 http authentication via prompts
13164 Update release notes to 1.6.3
13165 http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
13166 Read attributes from the index that is being checked out
13167 Update draft release notes to 1.6.3
13168 http tests: Darwin is not that special
13169 Rename interpret/substitute nth_last_branch functions
13170 strbuf_branchname(): a wrapper for branch name shorthands
13171 check-ref-format --branch: give Porcelain a way to grok branch shorthand
13172 Fix branch -m @{-1} newname
13173 strbuf_check_branch_ref(): a helper to check a refname for a branch
13174 check_ref_format(): tighten refname rules
13175 Update draft release notes to 1.6.3
13176 Speed up reflog pruning of unreachable commits
13177 Update draft release notes to 1.6.3
13178 sha1-lookup: fix up the assertion message
13179 Update draft release notes to 1.6.3
13183 Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
13184 Fix neglect of diff_setup()/diff_setup_done() symmetry.
13187 builtin-push.c: Fix typo: "anythig" -> "anything"
13189 Kevin McConnell (1):
13190 Add --staged to bash completion for git diff
13192 Kjetil Barvik (18):
13193 lstat_cache(): small cleanup and optimisation
13194 lstat_cache(): generalise longest_match_lstat_cache()
13195 lstat_cache(): swap func(length, string) into func(string, length)
13196 unlink_entry(): introduce schedule_dir_for_removal()
13197 create_directories(): remove some memcpy() and strchr() calls
13198 write_entry(): cleanup of some duplicated code
13199 write_entry(): use fstat() instead of lstat() when file is open
13200 show_patch_diff(): remove a call to fstat()
13201 lstat_cache(): print a warning if doing ping-pong between cache types
13202 check_updates(): effective removal of cache entries marked CE_REMOVE
13203 fix compile error when USE_NSEC is defined
13204 make USE_NSEC work as expected
13205 verify_uptodate(): add ce_uptodate(ce) test
13206 write_index(): update index_state->timestamp after flushing to disk
13207 stat_tracking_info(): only count real commits
13208 Record ns-timestamps if possible, but do not use it without USE_NSEC
13209 checkout bugfix: use stat.mtime instead of stat.ctime in two places
13210 Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
13212 Kristian Amlie (1):
13213 Add a test for checking whether gitattributes is honored by checkout.
13215 Linus Torvalds (2):
13216 Clean up reflog unreachability pruning decision
13217 Allow users to un-configure rename detection
13219 Marius Storm-Olsen (2):
13220 Add bare repository indicator for __git_ps1
13221 Fixup: Add bare repository indicator for __git_ps1
13223 Markus Heidelberg (1):
13224 add --html-path to get the location of installed HTML docs
13226 Martin Storsjö (1):
13227 Allow curl to rewind the read buffers
13230 git-send-email.txt: clarify which options take an argument.
13231 git-rev-list.txt: make ascii markup uniform with other pages.
13233 Michael Hendricks (1):
13234 format-patch: add arbitrary email headers
13236 Michael J Gruber (6):
13237 Typo and language fixes for git-checkout.txt
13238 test-lib.sh: Test for presence of git-init in the right path.
13239 test-lib.sh: Allow running the test suite against installed git
13240 git-branch.txt: document -f correctly
13241 Test for local branches being followed with --track
13242 Make local branches behave like remote branches when --tracked
13245 git-svn: support intermediate paths when matching tags/branches
13247 Michele Ballabio (6):
13248 apply: consistent spelling of "don't"
13249 apply: hide unused options from short help
13250 git log: avoid segfault with --all-match
13251 document --force-rebase
13252 rebase: add options passed to git-am
13253 rebase: fix typo (force_rebas -> force-rebas)
13256 Replace ",<,>,& with their respective XML entities in DAV requests
13259 parse-opt: migrate builtin-ls-files.
13260 Tests: use test_cmp instead of diff where possible
13261 http-push: using error() and warning() as appropriate
13262 builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
13263 builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
13264 builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
13265 builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
13266 builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
13267 builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
13268 builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
13269 refs: use warning() instead of fprintf(stderr, "warning: ")
13271 Nanako Shiraishi (4):
13272 Add --format that is a synonym to --pretty
13273 Give short-hands to --pretty=tformat:%formatstring
13274 Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
13275 Documentation/git.txt: GIT 1.6.2.2 has been out for a while
13278 format-patch: Respect --quiet option
13280 Nguyễn Thái Ngọc Duy (1):
13281 grep: prefer builtin over external one when coloring results
13284 git-p4: remove tabs from usermap file
13287 MinGW: a helper function that translates Win32 API error codes
13288 MinGW: a hardlink implementation
13290 Ramsay Allan Jones (1):
13291 git-instaweb: fix lighttpd configuration on cygwin
13294 grep: micro-optimize hit collection for AND nodes
13295 grep: remove grep_opt argument from match_expr_eval()
13296 grep: add pmatch and eflags arguments to match_one_pattern()
13297 grep: color patterns in output
13298 grep: add support for coloring with external greps
13299 parseopt: add PARSE_OPT_KEEP_UNKNOWN
13300 parseopt: add PARSE_OPT_NO_INTERNAL_HELP
13301 parseopt: make usage optional
13302 archive: use parseopt for local-only options
13303 parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
13304 parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
13305 pickaxe: count regex matches only once
13308 rerere: remove duplicated functions
13311 Documentation: enhance branch.<name>.{remote,merge}
13312 Documentation: push.default applies to all remotes
13313 Documentation: branch.*.merge can also affect 'git-push'
13314 Documentation: Introduce "upstream branch"
13316 Shawn O. Pearce (1):
13317 Don't permit ref/branch names to end with ".lock"
13320 git-svn: don't output git commits in quiet mode
13321 git-svn: add a double quiet option to hide git commits
13324 git-send-email.txt: describe --compose better
13325 pretty.c: add %f format specifier to format_commit_message()
13326 format-patch: construct patch filename in one function
13327 format-patch: pass a commit to reopen_stdout()
13328 format-patch: move get_patch_filename() into log-tree
13329 format-patch: --attach/inline uses filename instead of SHA1
13330 format-patch: --numbered-files and --stdout aren't mutually exclusive
13331 completion: add --annotate option to send-email
13332 completion: add --cc and --no-attachment option to format-patch
13333 completion: add --thread=deep/shallow to format-patch
13334 format_sanitized_subject: Don't trim past initial length of strbuf
13336 Sverre Rabbelier (1):
13337 Teach rebase to rebase even if upstream is up to date
13340 http.c: use strbuf API in quote_ref_url
13343 completion: For consistency, change "git rev-parse" to __gitdir calls
13344 completion: Use consistent if [...] convention, not "test"
13345 completion: Better __git_ps1 support when not in working directory
13346 completion: More fixes to prevent unbound variable errors
13349 bash completion: add --format= and --oneline options for "git log"
13352 format-patch: threading test reactivation
13353 Support coverage testing with GCC/gcov
13354 Test that diff can read from stdin
13355 Test diff --dirstat functionality
13357 Test fsck a bit harder
13358 Test log --decorate
13359 Test rev-list --parents/--children
13361 format-patch: track several references
13362 format-patch: thread as reply to cover letter even with in-reply-to
13363 format-patch: support deep threading
13364 Documentation: filter-branch: show --ignore-unmatch in main index-filter example
13366 Todd Zullinger (1):
13367 bash completion: Update 'git am' options
13369 Tor Arne Vestbø (2):
13370 git-rebase: Add --stat and --no-stat for producing diffstat on rebase
13371 git-pull: Allow --stat and --no-stat to be used with --rebase
13373 Wesley J. Landaker (1):
13374 Documentation: git-svn: fix trunk/fetch svn-remote key typo
13376 Wincent Colaiuta (2):
13377 Grammar fixes to "merge" and "patch-id" docs
13378 Grammar fix for "git merge" man page
13381 Version v1.6.2.5; changes since v1.6.2.4:
13382 -----------------------------------------
13385 builtin-merge: fix a typo in an error message
13386 Documentation: fix a grammatical error in api-builtin.txt
13388 Frank Lichtenheld (1):
13389 gitcvs-migration: Link to git-cvsimport documentation
13391 Johannes Schindelin (1):
13392 Fix off-by-one in read_tree_recursive
13394 Junio C Hamano (7):
13395 read-tree A B: do not corrupt cache-tree
13396 Move prime_cache_tree() to cache-tree.c
13397 read-tree -m A B: prime cache-tree from the switched-to tree
13398 checkout branch: prime cache-tree fully
13399 diff -c -p: do not die on submodules
13403 Linus Torvalds (3):
13404 process_{tree,blob}: show objects without buffering
13405 show_object(): push path_name() call further down
13406 grep: fix segfault when "git grep '('" is given
13408 Michał Kiedrowicz (3):
13409 tests: test applying criss-cross rename patch
13410 builtin-apply: keep information about files to be deleted
13411 tests: make test-apply-criss-cross-rename more robust
13414 honor repack.usedeltabaseoffset when fetching packs
13417 test-genrandom: Add newline to usage string
13419 Wincent Colaiuta (1):
13420 git add -p: add missing "q" to patch prompt
13423 Version v1.6.2.4; changes since v1.6.2.3:
13424 -----------------------------------------
13426 Björn Steinbrink (1):
13427 tree_entry_interesting: a pathspec only matches at directory boundary
13429 Clemens Buchacher (3):
13430 add tests for merging with submodules
13431 update cache for conflicting submodule entries
13432 simplify output of conflicting merge
13434 Erik Faye-Lund (4):
13435 test-suite: adding a test for fast-export with tag variants
13436 builtin-fast-export.c: turn error into warning
13437 builtin-fast-export.c: fix crash on tagged trees
13438 builtin-fast-export.c: handle nested tags
13440 Frank Lichtenheld (1):
13441 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
13444 doc/gitattributes: clarify location of config text
13445 add-interactive: refactor mode hunk handling
13448 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
13450 Johannes Schindelin (1):
13451 Fix 'git checkout <submodule>' to update the index
13454 t1301-shared-repo: fix forced modes test
13456 Junio C Hamano (4):
13457 match_tree_entry(): a pathspec only matches at directory boundaries
13458 Describe fixes since 1.6.2.3
13459 Speed up reflog pruning of unreachable commits
13462 Linus Torvalds (1):
13463 Clean up reflog unreachability pruning decision
13465 Markus Heidelberg (2):
13466 doc/git-daemon: add missing arguments to options
13467 doc/git-daemon: add missing arguments to max-connections option
13470 git add -p: new "quit" command at the prompt.
13471 Update git-add.txt according to the new possibilities of 'git add -p'.
13473 Nguyễn Thái Ngọc Duy (1):
13474 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
13477 imap-send: use correct configuration variable in documentation
13479 Thomas Jarosch (1):
13480 Fix buffer overflow in config parser
13483 git-apply: fix option description
13486 Version v1.6.2.3; changes since v1.6.2.2:
13487 -----------------------------------------
13489 Björn Steinbrink (1):
13490 process_{tree,blob}: Remove useless xstrdup calls
13493 t7700-repack: add two new tests demonstrating repacking flaws
13494 git-repack.sh: don't use --kept-pack-only option to pack-objects
13495 pack-objects: only repack or loosen objects residing in "local" packs
13496 Remove --kept-pack-only option and associated infrastructure
13497 t7700: demonstrate repack flaw which may loosen objects unnecessarily
13498 pack-objects: don't loosen objects available in alternate or kept packs
13501 git-repack: use non-dashed update-server-info
13503 Daniel Cheng (aka SDiZ) (1):
13504 State the effect of filter-branch on graft explicitly
13507 Change double quotes to single quotes in message
13510 Documentation: clarify .gitattributes search
13513 t1301: loosen test for forced modes
13514 commit: abort commit if interactive add failed
13517 Move chmod(foo, 0444) into move_temp_to_file()
13520 git submodule: fix usage line
13522 Junio C Hamano (12):
13523 git-repack: resist stray environment variable
13524 has_sha1_pack(): refactor "pretend these packs do not exist" interface
13525 has_sha1_kept_pack(): take "struct rev_info"
13526 Consolidate ignore_packed logic more
13527 Simplify is_kept_pack()
13528 is_kept_pack(): final clean-up
13529 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
13530 "core.sharedrepository = 0mode" should set, not loosen
13531 move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
13532 set_shared_perm(): sometimes we know what the final mode bits should look like
13533 Start 1.6.2.3 preparation
13536 Linus Torvalds (1):
13537 process_{tree,blob}: Remove useless xstrdup calls
13539 Markus Heidelberg (1):
13540 doc/git-pack-refs: fix two grammar issues
13543 git-checkout.txt: fix incorrect statement about HEAD and index
13544 git-checkout.txt: clarify that <branch> applies when no path is given.
13545 git-pull.sh: better warning message for "git pull" on detached head.
13548 Version v1.6.2.2; changes since v1.6.2.1:
13549 -----------------------------------------
13552 Documentation: update graph api example.
13555 git-branch: display "was sha1" on branch deletion rather than just "sha1"
13557 Carlo Marcelo Arenas Belon (1):
13558 documentation: update cvsimport description of "-r" for recent clone
13560 Daniel Barkalow (1):
13561 Give error when no remote is configured
13563 Daniel Cheng (aka SDiZ) (1):
13564 Fix bash completion in path with spaces
13567 everyday: use the dashless form of git-init
13569 David J. Mellor (12):
13570 Documentation: minor grammatical fixes in git-archive.txt.
13571 Documentation: reword the "Description" section of git-bisect.txt.
13572 Documentation: minor grammatical fixes in git-blame.txt.
13573 Documentation: minor grammatical fixes in git-branch.txt.
13574 Documentation: reworded the "Description" section of git-bisect.txt.
13575 Documentation: reword example text in git-bisect.txt.
13576 Documentation: remove some uses of the passive voice in git-bisect.txt
13577 Documentation: minor grammatical fixes and rewording in git-bundle.txt
13578 Documentation: minor grammatical fixes in git-cat-file.txt
13579 Documentation: minor grammatical fixes in git-check-attr.txt
13580 Documentation: minor grammatical fix in git-check-ref-format.txt
13581 Documentation: Remove spurious uses of "you" in git-bisect.txt.
13584 test-lib: Clean up comments and Makefile.
13587 git-svn: fix ls-tree usage with dash-prefixed paths
13590 Documentation: Remove an odd "instead"
13593 doc: clarify how -S works
13594 ls-files: require worktree when --deleted is given
13595 fix portability problem with IS_RUN_COMMAND_ERR
13597 Johannes Schindelin (4):
13598 rsync transport: allow local paths, and fix tests
13599 Smudge the files fed to external diff and textconv
13600 import-zips: fix thinko
13601 mailmap: resurrect lower-casing of email addresses
13604 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
13605 diff --no-index: Do not generate patch output if other output is requested
13607 Junio C Hamano (6):
13608 read-tree A B C: do not create a bogus index and do not segfault
13609 Remove total confusion from git-fetch and git-push
13610 blame: read custom grafts given by -S before calling setup_revisions()
13611 Update draft release notes to 1.6.2.2
13612 Update draft release notes to 1.6.2.2
13615 Linus Torvalds (1):
13616 close_sha1_file(): make it easier to diagnose errors
13618 Michael J Gruber (2):
13619 git submodule: Add test cases for git submodule add
13620 git submodule: Fix adding of submodules at paths with ./, .. and //
13622 Nico -telmich- Schottelius (1):
13623 git-tag(1): add hint about commit messages
13626 avoid possible overflow in delta size filtering computation
13629 diffcore-pickaxe: use memmem()
13630 optimize compat/ memmem()
13631 pickaxe: count regex matches only once
13633 Shawn O. Pearce (1):
13634 Increase the size of the die/warning buffer to avoid truncation
13637 format-patch: --numbered-files and --stdout aren't mutually exclusive
13640 send-email: respect in-reply-to regardless of threading
13641 send-email: test --no-thread --in-reply-to combination
13642 Documentation: format-patch --root clarifications
13643 bash completion: only show 'log --merge' if merging
13646 Version v1.6.2.1; changes since v1.6.2:
13647 ---------------------------------------
13650 builtin-revert.c: release index lock when cherry-picking an empty commit
13652 Christian Couder (1):
13653 Documentation: fix badly indented paragraphs in "--bisect-all" description
13656 Ensure proper setup of git_dir for git-hash-object
13658 Finn Arne Gangstad (1):
13659 Support "\" in non-wildcard exclusion entries
13662 send-email: allow send-email to run outside a repo
13663 send-email: handle multiple Cc addresses when reading mbox message
13664 send-email: --suppress-cc improvements
13665 send-email: don't create temporary compose file until it is needed
13668 never fallback relative times to absolute
13669 t1300: use test_must_fail as appropriate
13670 document config --bool-or-int
13673 Make the 'lock file' exists error more informative
13675 Junio C Hamano (4):
13676 git-add -i/-p: learn to unwrap C-quoted paths
13677 Beginning of 1.6.2 maintenance track
13678 Update draft release notes for 1.6.2.1
13682 cleanup: add isascii()
13685 Version v1.6.2; changes since v1.6.2-rc2:
13686 -----------------------------------------
13689 git-svn - return original format_svn_date semantics
13691 Christian Couder (2):
13692 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
13693 bisect: fix another instance of eval'ed string
13696 added missing backtick in git-apply.txt
13698 David J. Mellor (4):
13699 Documentation: minor grammatical fixes.
13700 Documentation: minor grammatical fixes.
13701 Documentation: minor grammatical fixes.
13702 Documentation: minor grammatical fixes.
13705 git-svn: disable broken symlink workaround by default
13708 t5540-http-push.sh: avoid non-portable grep -P
13711 t3400-rebase: Move detached HEAD check earlier
13713 Junio C Hamano (2):
13714 git-am: make --abort less dangerous
13717 Michael J Gruber (1):
13718 git-am: Keep index in case of abort with dirty index
13721 Fix odb_mkstemp() on AIX
13722 Documentation: Typos / spelling fixes in RelNotes
13723 Documentation: Expand a couple of abbreviations
13724 Documentation: Typo / spelling / formatting fixes
13726 Paul Mackerras (1):
13727 gitk: Fix possible infinite loop and display corruption
13730 Documentation/git-archive.txt: Note attributes
13732 Todd Zullinger (1):
13733 git-rebase: Update --whitespace documentation
13736 Version v1.6.2-rc2; changes since v1.6.2-rc1:
13737 ---------------------------------------------
13739 Abhijit Menon-Sen (1):
13740 Convert git-* invocations to "git *" in the svnimport example.
13742 Alexandre Julliard (3):
13743 git.el: Make sure that file lists are sorted as they are created.
13744 git.el: Improve the confirmation message on remove and revert.
13745 Add a README in the contrib/emacs directory.
13748 trace: Fixed a minor typo in an error message.
13751 git-svn fix to avoid using strftime %z
13753 Brian Gernhardt (1):
13754 git-svn: Create leading directories in create-ignore
13756 Christian Couder (1):
13757 README: fix path to "gitcvs-migration.txt" and be more consistent
13760 git-svn: fix delete+add branch tracking with empty files
13762 Felipe Contreras (2):
13763 git add: trivial codestyle cleanup
13764 sha1_file.c: fix typo
13767 Documentation/git-push: --all, --mirror, --tags can not be combined
13768 Install builtins with the user and group of the installing personality
13769 git-quiltimport: preserve standard input to be able to read user input
13771 Giuseppe Bilotta (1):
13772 gitweb: fix wrong base URL when non-root DirectoryIndex
13775 disallow providing multiple upstream branches to rebase, pull --rebase
13776 Allow HTTP tests to run on Darwin
13778 Johannes Schindelin (2):
13779 Introduce the function strip_path_suffix()
13780 system_path(): simplify using strip_path_suffix(), and add suffix "git"
13783 gitattributes.txt: Path matching rules are explained in gitignore.txt
13785 Junio C Hamano (4):
13786 git-svn: fix parsing of timestamp obtained from svn
13787 tests: fix "export var=val"
13788 Make sure objects/pack exists before creating a new pack
13791 Lars Noschinski (1):
13792 filter-branch -d: Export GIT_DIR earlier
13794 Linus Torvalds (1):
13795 Support 'raw' date format
13797 Marc Branchaud (1):
13798 Docs: Expand explanation of the use of + in git push refspecs.
13800 Marcel M. Cary (2):
13801 gitweb: Fix warnings with override permitted but no repo override
13802 gitweb: Hyperlink multiple git hashes on the same commit message line
13805 Document git blame --reverse.
13806 More friendly message when locking the index fails.
13808 Michael J Gruber (1):
13809 Fix typo in contrib/examples/git-svnimport.txt
13812 Skip timestamp differences for diff --no-index
13815 git-p4: avoid syncing duplicate changes
13817 Peter Oberndorfer (1):
13818 git-svn: read the dcommit url from the config file on a per remote basis
13821 bash: add missing 'git merge' options
13822 bash: update 'git svn' options
13825 bash completion: refactor common log, shortlog and gitk options
13826 bash completion: only show 'log --merge' if merging
13828 Todd Zullinger (1):
13829 Documentation: Note file formats send-email accepts
13832 Version v1.6.2-rc1; changes since v1.6.2-rc0:
13833 ---------------------------------------------
13835 Alexandre Julliard (1):
13836 Describe notable git.el changes in the release notes
13838 Anton Gyllenberg (1):
13839 test case for regression caused by git-svn empty symlink fix
13841 Christian Couder (1):
13842 rev-list: fix showing distance when using --bisect-all
13845 git-svn: Print revision while searching for earliest use of path
13848 git-svn: Fix for rewriteRoot URL containing username.
13851 fast-export: ensure we traverse commits in topological order
13854 filter-branch: Add more error-handling
13857 git-svn: allow disabling expensive broken symlink checks
13858 git-svn: fix broken symlink workaround when switching branches
13861 submodule: add --no-fetch parameter to update command
13864 Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
13866 Jakub Narebski (1):
13867 gitweb: Better regexp for SHA-1 committag match
13870 symbolic-ref: allow refs/<whatever> in HEAD
13873 Update documentation to add further information about using Thunderbird with git-imap-send.
13875 Johannes Schindelin (4):
13876 Let ls-files strip trailing slashes in submodules' paths
13877 submodule: warn about non-submodules
13878 Add two extra tests for git rebase
13879 gc: make --prune useful again by accepting an optional parameter
13882 Make test-path-utils more robust against incorrect use
13883 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
13884 Test and fix normalize_path_copy()
13885 Remove unused normalize_absolute_path()
13887 Junio C Hamano (16):
13888 Revert "Merge branch 'js/notes'"
13889 Modernize t5400 test script
13890 remote prune: warn dangling symrefs
13891 Warn use of "origin" when remotes/origin/HEAD is dangling
13892 Drop double-semicolon in C
13893 receive-pack: receive.denyDeleteCurrent
13894 builtin-receive-pack.c: do not initialize statics to 0
13895 revision traversal and pack: notice and die on missing commit
13896 Squelch overzealous "ignoring dangling symref" in an empty repository
13897 Make repack less likely to corrupt repository
13898 Prepare for 1.6.1.4.
13899 Revert "validate_headref: tighten ref-matching to just branches"
13900 Install the default "master" branch configuration after cloning a void
13901 Teach the "@{-1} syntax to "git branch"
13902 Teach @{-1} to git merge
13906 Remove redundant bit clears from diff_setup()
13909 tree.c: allow read_tree_recursive() to traverse gitlink entries
13911 Marcel M. Cary (1):
13912 git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
13914 Marius Storm-Olsen (5):
13915 Add mailmap.file as configurational option for mailmap location
13916 Add find_insert_index, insert_at_index and clear_func functions to string_list
13917 Add map_user() and clear_mailmap() to mailmap
13918 Change current mailmap usage to do matching on both name and email of author/committer.
13919 Move mailmap documentation into separate file
13922 git-rebase.txt: --interactive does not work with --whitespace
13925 bash-completion: Complete the values of color.interactive, color.ui, color.pager
13927 Matt McCutchen (1):
13928 gitweb: add $prevent_xss option to prevent XSS by repository content
13930 Michael J Gruber (1):
13931 Fix the installation path for html documentation
13934 Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
13937 Fix contrib/hooks/post-receive-email for new duplicate branch
13940 Fix GIT_CEILING_DIRECTORIES on Windows
13941 builtin-receive-pack.c: fix compiler warnings about format string
13944 Move 'rev-parse --git-dir' test to t1500
13945 t1500: more 'git rev-parse --git-dir' tests
13946 bash: fix misspelled 'git svn' option
13949 git-svn: abstract out a block into new method other_gs()
13952 doc/bundle: Use the more conventional suffix '.bundle'
13954 Shawn O. Pearce (2):
13955 Clear the delta base cache during fast-import checkpoint
13956 Clear the delta base cache if a pack is rebuilt
13958 Sitaram Chamarty (1):
13959 Documentation: clarify commits affected by gitk --merge
13962 add -p: get rid of Git.pm warnings about unitialized values
13963 Makefile: resort filenames alphabetically
13964 Generalize and libify index_is_dirty() to index_differs_from(...)
13967 use a hash of the lock token as the suffix for PUT/MOVE
13970 completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.
13971 completion: Get rid of tabbed indentation in comments. Replace with spaces.
13974 log: do not print ellipses with --abbrev-commit
13975 Documentation: pruning recipe for destructive filter-branch
13977 Todd Zullinger (1):
13978 git-web--browse: Fix check for /bin/start
13981 Version v1.6.2-rc0; changes since v1.6.1.4:
13982 -------------------------------------------
13985 builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily
13986 git.c: make autocorrected aliases work
13987 t7501-commit.sh: explicitly check that -F prevents invoking the editor
13989 Alexander Potashev (4):
13990 remove trailing LF in die() messages
13991 add is_dot_or_dotdot inline function
13992 Allow cloning to an existing empty directory
13993 Replace deprecated dashed git commands in usage
13995 Alexandre Julliard (8):
13996 git.el: Add a checkout command.
13997 git.el: Add a command to create a new branch.
13998 git.el: Add commands for cherry-pick and revert.
13999 git.el: Make git-run-command-region display the error if any.
14000 git.el: Set a regexp for paragraph-separate in log-edit mode.
14001 git.el: Use integer instead of character constants in case statement.
14002 git.el: Add some notes about Emacs versions compatibility.
14003 emacs: Remove the no longer maintained vc-git package.
14005 Arjen Laarhoven (1):
14006 t/t4202-log.sh: Add testcases
14008 Benjamin Kramer (1):
14011 Boyd Stephen Smith Jr (2):
14012 color-words: Support diff.wordregex config option
14013 Change the spelling of "wordregex".
14016 t7700: demonstrate misbehavior of 'repack -a' when local packs exist
14017 Makefile: use shell for-loop rather than Make's foreach loop during install
14019 Charles Bailey (7):
14020 Fix some tab/space inconsistencies in git-mergetool.sh
14021 Add -y/--no-prompt option to mergetool
14022 mergetool: Add prompt to continue after failing to merge a file
14023 mergetool: Don't keep temporary merge files unless told to
14024 mergetool: respect autocrlf by using checkout-index
14025 mergetool: Add a test for running mergetool in a sub-directory
14026 mergetool: fix running mergetool in sub-directories
14028 Christian Couder (1):
14029 sha1_file: make "read_object" static
14031 Clemens Buchacher (2):
14032 clean up pathspec matching
14033 remove pathspec_match, use match_pathspec instead
14036 contrib: add 'git difftool' for launching common merge tools
14037 difftool: fix documentation problems
14038 difftool: put the cursor on the editable file for Vim
14039 contrib/difftool: Don't repeat merge tool candidates
14041 David M. Syzdek (1):
14042 autoconf: Enable threaded delta search when pthreads are supported
14045 git-svn: add --authors-file test
14046 git-svn: handle empty files marked as symlinks in SVN
14047 git-svn: better attempt to handle broken symlink updates
14048 git-svn: fix SVN 1.1.x compatibility
14049 git-svn: avoid importing nested git repos
14050 git-svn: fix memory leak when checking for empty symlinks
14053 cvsserver: add option to configure commit message
14054 cvsserver: change generation of CVS author names
14056 Giuseppe Bilotta (16):
14057 gitweb: add patch view
14058 gitweb: change call pattern for git_commitdiff
14059 gitweb: add patches view
14060 gitweb: link to patch(es) view in commit(diff) and (short)log view
14061 gitweb: use href() when generating URLs in OPML
14062 gitweb: don't use pathinfo for global actions
14063 gitweb: suggest name for OPML view
14064 gitweb: channel image in rss feed
14065 gitweb: feed generator metadata
14066 gitweb: rss feed managingEditor
14067 gitweb: rss channel date
14068 gitweb: last-modified time should be commiter, not author
14069 gitweb: check if-modified-since for feeds
14070 gitweb: make static files accessible with PATH_INFO
14071 gitweb: webserver config for PATH_INFO
14072 gitweb: align comments to code
14075 Make opt_parse_with_commit() non-static
14076 Make has_commit() non-static
14077 git-tag: Add --contains option
14079 Jakub Narebski (4):
14080 gitweb: Move 'lineno' id from link to row element in git_blame
14081 gitweb: A bit of code cleanup in git_blame()
14082 gitweb: cache $parent_commit info in git_blame()
14083 gitweb: Update README that gitweb works better with PATH_INFO
14086 git-am: minor cleanups
14087 Makefile: minor improvements for Mac OS X (Darwin)
14090 Makefile: clean up TEST_PROGRAMS definition
14091 color: make it easier for non-config to parse color specs
14092 expand --pretty=format color options
14093 diff: refactor tempfile cleanup handling
14094 chain kill signals for cleanup functions
14095 refactor signal handling for cleanup functions
14096 pager: do wait_for_pager on signal death
14097 validate_headref: tighten ref-matching to just branches
14098 symbolic ref: refuse non-ref targets in HEAD
14099 t0005: use SIGTERM for sigchain test
14101 Johannes Gilger (1):
14102 mergetool: Don't repeat merge tool candidates
14104 Johannes Schindelin (24):
14105 Force t5302 to use a single thread
14106 Introduce commit notes
14107 Add a script to edit/inspect notes
14108 git wrapper: Make while loop more reader-friendly
14109 bundle: allow rev-list options to exclude annotated tags
14110 show <tag>: reuse pp_user_info() instead of duplicating code
14111 Implement the patience diff algorithm
14112 Introduce the diff option '--patience'
14113 bash completions: Add the --patience option
14114 Speed up git notes lookup
14115 Add an expensive test for git-notes
14116 Add color_fwrite_lines(), a function coloring each line individually
14117 color-words: refactor word splitting and use ALLOC_GROW()
14118 color-words: change algorithm to allow for 0-character word boundaries
14119 color-words: take an optional regular expression describing words
14120 Fix parsing of @{-1}@{1}
14121 rebase -i --root: fix check for number of arguments
14122 t3404 & t3411: undo copy&paste
14123 lib-rebase.sh: Document what set_fake_editor() does
14124 test-lib.sh: introduce test_commit() and test_merge() helpers
14128 Fix 'git diff --no-index' with a non-existing symlink target
14131 Windows: Fix signal numbers
14132 Windows: Fix intermittent failures of t7701
14135 Fix Documentation typos surrounding the word 'handful'.
14138 git-am: Make it easier to see which patch failed
14140 Junio C Hamano (26):
14141 Document "git-reset --merge"
14143 Resurrect "git apply --flags -" to read from the standard input
14144 git-am: add --directory=<dir> option
14145 Update 1.6.2 draft release notes
14146 git-am: fix shell quoting
14147 checkout: implement "@{-N}" shortcut name for N-th last branch
14148 git-am: re-fix the diag message printing
14149 interpret_nth_last_branch(): avoid traversing the reflog twice
14150 Fix reflog parsing for a malformed branch switching entry
14151 interpret_nth_last_branch(): plug small memleak
14152 Introduce for_each_recent_reflog_ent().
14153 Simplify parsing branch switching events in reflog
14154 http-push.c: style fixes
14155 am: Add --committer-date-is-author-date option
14156 rebase -i: correctly remember --root flag across --continue
14157 tests: Avoid single-shot environment export for shell function invocation
14158 Update draft release notes to 1.6.2
14159 fsck: HEAD is part of refs
14160 fsck: check loose objects from alternate object stores by default
14161 http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
14162 receive-pack: explain what to do when push updates the current branch
14163 t3412: further simplify setting of GIT_EDITOR
14164 tests: fix test_commit() for case insensitive filesystems
14165 Makefile: fix misdetection of relative pathnames
14169 test more combinations of ignore-whitespace options to diff
14171 Kirill Smelkov (1):
14172 mailinfo: cleanup extra spaces for complex 'From:'
14175 Cleanup of unused symcache variable inside diff-lib.c
14176 lstat_cache(): more cache effective symlink/directory detection
14177 lstat_cache(): introduce has_symlink_or_noent_leading_path() function
14178 lstat_cache(): introduce has_dirs_only_path() function
14179 lstat_cache(): introduce invalidate_lstat_cache() function
14180 lstat_cache(): introduce clear_lstat_cache() function
14183 bash completion: Add '--intent-to-add' long option for 'git add'
14184 bash completion: Use 'git add' completions for 'git stage'
14186 Linus Torvalds (1):
14187 Add 'merge' mode to 'git reset'
14189 Marcel Koeppen (1):
14190 git-svn: Show UUID in svn info for added directories with svn 1.5.5
14192 Markus Heidelberg (10):
14193 git-cherry: make <upstream> parameter optional
14194 Documentation: clarify which parameters are optional to git-cherry
14195 contrib/vim: change URL to point to the latest syntax files
14196 Documentation: let asciidoc align related options
14197 mergetool: put the cursor on the editable file for Vim
14198 contrib/difftool: change trap condition from SIGINT to INT
14199 contrib/difftool: remove distracting 'echo' in the SIGINT handler
14200 use uppercase POSIX compliant signals for the 'trap' command
14201 bash completion: add 'rename' subcommand to git-remote
14202 contrib/difftool: add support for Kompare
14205 gitweb: unify boolean feature subroutines
14207 Michele Ballabio (1):
14208 git-shortlog.txt: fix example about .mailmap
14211 Add support for a pdf version of the user manual
14212 parse-opt: migrate builtin-apply.
14213 gittutorial: remove misleading note
14215 Nanako Shiraishi (3):
14216 git-am: Add --ignore-date option
14217 Mention "local convention" rule in the CodingGuidelines
14218 git-bundle doc: update examples
14221 autodetect number of CPUs by default when using threads
14222 pack-objects: don't use too many threads with few objects
14225 config.mak.in: define paths without trailing slash
14228 git-svn: Add --localtime option to "fetch"
14230 Pierre Habouzit (1):
14231 filter-branch: add git_commit_non_empty_tree and --prune-empty.
14233 Ralf Wildenhues (1):
14234 Fix naming scheme for configure cache variables.
14237 http-push: refactor lock-related headers creation for curl requests
14240 diff: add option to show context between close hunks
14241 strbuf: instate cleanup rule in case of non-memory errors
14242 grep -w: forward to next possible position after rejected match
14243 grep: don't call regexec() for fixed strings
14246 Change NUL char handling of isspecial()
14247 Add is_regex_special()
14248 Optimize color_parse_mem
14251 bash: add '--merge' to 'git reset'
14252 bash: remove unnecessary checks for long options with argument
14253 bash: add missing format-patch command line options
14254 bash: refactor 'git log --pretty=<format>' options
14257 commit: more compact summary and without extra quotes
14258 tutorial-2: Update with the new "git commit" ouput
14260 Serge van den Boom (1):
14261 Makefile: Make 'configure --with-expat=path' actually work
14263 Stefan Karpinski (2):
14264 git-cvsserver: handle CVS 'noop' command.
14265 git-cvsserver: run post-update hook *after* update.
14267 Steffen Prohaska (6):
14268 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
14269 git_extract_argv0_path(): Move check for valid argv0 from caller to callee
14270 Add calls to git_extract_argv0_path() in programs that call git_config_*
14271 Modify setup_path() to only add git_exec_path() to PATH
14272 Compute prefix at runtime if RUNTIME_PREFIX is set
14273 Windows: Revert to default paths and convert them by RUNTIME_PREFIX
14276 checkout: don't crash on file checkout before running post-checkout hook
14277 Move run_hook() from builtin-commit.c into run-command.c (libgit)
14278 api-run-command.txt: talk about run_hook()
14279 run_hook(): check the executability of the hook before filling argv
14280 run_hook(): allow more than 9 hook arguments
14283 Refactor git_set_argv0_path() to git_extract_argv0_path()
14285 Sverre Rabbelier (1):
14286 Allow cloning an empty repository
14289 http-push: refactor request url creation
14290 http-push: add back underscore separator before lock token
14291 http-push: wrap signature of get_remote_object_url
14294 bash-completion: Support running when set -u is enabled
14295 bash-completion: Try bash completions before simple filetype
14296 bash-completion: Add comments to remind about required arguments
14297 make: Remove -pthread on Darwin (it is included by cstdlib).
14300 Fix the building of user-manual.texi and gitman.texi documents
14301 Fix the building of gitman.info document
14302 diff-options.txt: Fix asciidoc markup issue
14305 rebase -i: execute hook only after argument checking
14306 rebase: learn to rebase root commit
14307 rebase -i: learn to rebase root commit
14308 rebase: update documentation for --root
14309 notes: fix core.notesRef documentation
14310 color-words: enable REG_NEWLINE to help user
14311 color-words: expand docs with precise semantics
14312 color-words: make regex configurable via attributes
14313 sha1_name: tweak @{-N} lookup
14314 sha1_name: support @{-N} syntax in get_sha1()
14315 checkout: implement "-" abbreviation, add docs and tests
14316 bash completion: move pickaxe options to log
14317 bash completion: refactor diff options
14318 t1505: remove debugging cruft
14319 t3412: clean up GIT_EDITOR usage
14320 t3412: use log|name-rev instead of log --graph
14321 bash: offer to show (un)staged changes
14322 add -p: change prompt separator for 'g'
14323 add -p: trap Ctrl-D in 'goto' mode
14324 contrib git-resurrect: find traces of a branch name and resurrect it
14325 add -p: prompt for single characters
14326 add -p: print errors in separate color
14327 add -p: import Term::ReadKey with 'require'
14329 Tor Arne Vestbø (1):
14330 git-notes: fix printing of multi-line notes
14332 Vitaly "_Vi" Shukela (3):
14333 git-svn: add --ignore-paths option for fetching
14334 git-svn: documented --ignore-paths
14335 git-svn: Add test for --ignore-paths parameter
14337 William Pursell (5):
14338 Add subroutine to display one-line summary of hunks
14339 Add 'g' command to go to a hunk
14340 git-add -i/-p: Change prompt separater from slash to comma
14341 Add / command in add --patch
14342 In add --patch, Handle K,k,J,j slightly more gracefully.
14344 jidanni@jidanni.org (1):
14345 git-show-branch doc: show -g as synonym to --reflog in the list
14347 martin f. krafft (1):
14348 git-am: implement --reject option passed to git-apply
14351 Version v1.6.1.4; changes since v1.6.1.3:
14352 -----------------------------------------
14355 Documentation: update graph api example.
14356 builtin-merge: fix a typo in an error message
14357 Documentation: fix a grammatical error in api-builtin.txt
14359 Björn Steinbrink (2):
14360 tree_entry_interesting: a pathspec only matches at directory boundary
14361 process_{tree,blob}: Remove useless xstrdup calls
14364 t7700-repack: add two new tests demonstrating repacking flaws
14365 git-repack.sh: don't use --kept-pack-only option to pack-objects
14366 pack-objects: only repack or loosen objects residing in "local" packs
14367 Remove --kept-pack-only option and associated infrastructure
14368 git-branch: display "was sha1" on branch deletion rather than just "sha1"
14369 t7700: demonstrate repack flaw which may loosen objects unnecessarily
14370 pack-objects: don't loosen objects available in alternate or kept packs
14373 builtin-revert.c: release index lock when cherry-picking an empty commit
14375 Christian Couder (3):
14376 rev-list: fix showing distance when using --bisect-all
14377 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
14378 bisect: fix another instance of eval'ed string
14381 git-repack: use non-dashed update-server-info
14383 Daniel Cheng (aka SDiZ) (2):
14384 Fix bash completion in path with spaces
14385 State the effect of filter-branch on graft explicitly
14388 added missing backtick in git-apply.txt
14391 everyday: use the dashless form of git-init
14393 David J. Mellor (1):
14394 Documentation: minor grammatical fixes.
14397 fast-export: ensure we traverse commits in topological order
14398 Ensure proper setup of git_dir for git-hash-object
14401 test-lib: Clean up comments and Makefile.
14404 filter-branch: Fix fatal error on bare repositories
14406 Finn Arne Gangstad (1):
14407 Support "\" in non-wildcard exclusion entries
14409 Frank Lichtenheld (1):
14410 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
14412 Geoffrey Thomas (2):
14413 utf8: add utf8_strwidth()
14414 builtin-blame.c: Use utf8_strwidth for author's names
14417 Documentation/git-push: --all, --mirror, --tags can not be combined
14420 Documentation: Remove an odd "instead"
14423 Documentation: clarify .gitattributes search
14426 builtin-remote: make rm() use properly named variable to hold return value
14427 builtin-remote: make rm operation safer in mirrored repository
14430 git: s/run_command/run_builtin/
14431 run_command(): handle missing command errors more gracefully
14432 run_command(): help callers distinguish errors
14433 git: use run_command() to execute dashed externals
14434 commit: abort commit if interactive add failed
14436 Johannes Schindelin (3):
14437 Fix submodule squashing into unrelated commit
14438 filter-branch: do not consider diverging submodules a 'dirty worktree'
14439 import-zips: fix thinko
14442 Make test-path-utils more robust against incorrect use
14443 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
14444 Test and fix normalize_path_copy()
14445 Remove unused normalize_absolute_path()
14446 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
14447 diff --no-index: Do not generate patch output if other output is requested
14449 Junio C Hamano (19):
14450 revision traversal: allow UNINTERESTING objects to be missing
14451 rebase -i squashes submodule changes into unrelated commit
14452 add -u: do not fail to resolve a path as deleted
14453 revision traversal and pack: notice and die on missing commit
14454 Make repack less likely to corrupt repository
14455 Prepare for 1.6.1.4.
14456 tests: fix "export var=val"
14457 Make sure objects/pack exists before creating a new pack
14458 git-repack: resist stray environment variable
14459 has_sha1_pack(): refactor "pretend these packs do not exist" interface
14460 has_sha1_kept_pack(): take "struct rev_info"
14461 Consolidate ignore_packed logic more
14462 Simplify is_kept_pack()
14463 is_kept_pack(): final clean-up
14464 blame: read custom grafts given by -S before calling setup_revisions()
14465 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
14466 match_tree_entry(): a pathspec only matches at directory boundaries
14467 diff -c -p: do not die on submodules
14470 Kirill Smelkov (4):
14471 mailinfo: correctly handle multiline 'Subject:' header
14472 mailinfo: 'From:' header should be unfold as well
14473 mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
14474 mailinfo: tests for RFC2047 examples
14476 Linus Torvalds (3):
14477 close_sha1_file(): make it easier to diagnose errors
14478 process_{tree,blob}: Remove useless xstrdup calls
14479 grep: fix segfault when "git grep '('" is given
14481 Markus Heidelberg (1):
14482 doc/git-daemon: add missing arguments to options
14484 Matt McCutchen (1):
14485 gitweb: add $prevent_xss option to prevent XSS by repository content
14488 Document git blame --reverse.
14489 More friendly message when locking the index fails.
14490 git-checkout.txt: fix incorrect statement about HEAD and index
14491 git-checkout.txt: clarify that <branch> applies when no path is given.
14494 Skip timestamp differences for diff --no-index
14497 Fix odb_mkstemp() on AIX
14499 Nico -telmich- Schottelius (1):
14500 git-tag(1): add hint about commit messages
14503 avoid possible overflow in delta size filtering computation
14506 Fix GIT_CEILING_DIRECTORIES on Windows
14508 Shawn O. Pearce (2):
14509 Clear the delta base cache during fast-import checkpoint
14510 Clear the delta base cache if a pack is rebuilt
14513 test-genrandom: Add newline to usage string
14515 Thomas Jarosch (1):
14516 Fix buffer overflow in config parser
14519 Documentation: format-patch --root clarifications
14520 bash completion: only show 'log --merge' if merging
14522 Todd Zullinger (1):
14523 Documentation: Note file formats send-email accepts
14526 Version v1.6.1.3; changes since v1.6.1.2:
14527 -----------------------------------------
14529 Anders Melchiorsen (2):
14530 Documentation: more git push examples
14531 Documentation: rework src/dst description in git push
14533 David J. Mellor (1):
14534 Fixed broken git help -w when installing from RPM
14537 fix typo in Documentation
14538 add test-dump-cache-tree in Makefile
14540 Johannes Schindelin (2):
14541 revision walker: include a detached HEAD in --all
14542 apply: fix access to an uninitialized mode variable, found by valgrind
14544 Junio C Hamano (6):
14545 bundle: allow the same ref to be given more than once
14546 Documentation: simplify refspec format description
14547 diff.c: output correct index lines for a split diff
14548 builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
14549 grep: pass -I (ignore binary) down to external grep
14553 test more combinations of ignore-whitespace options to diff
14554 Fix combined use of whitespace ignore options to diff
14556 Linus Torvalds (1):
14557 Wrap inflate and other zlib routines for better error reporting
14560 Missing && in t/t7001.sh.
14561 Add a testcase for "git mv -f" on untracked files.
14562 builtin-mv.c: check for unversionned files before looking at the destination.
14565 merge: fix out-of-bounds memory access
14568 Fix gitdir detection when in subdir of gitdir
14571 urls.txt: document optional port specification in git URLS
14573 William Pursell (1):
14574 User-manual: "git stash <comment>" form is long gone
14577 Version v1.6.1.2; changes since v1.6.1.1:
14578 -----------------------------------------
14580 Björn Steinbrink (1):
14581 Rename detection: Avoid repeated filespec population
14584 avoid 31-bit truncation in write_loose_object
14586 Johannes Schindelin (2):
14587 get_sha1_basic(): fix invalid memory access, found by valgrind
14588 test-path-utils: Fix off by one, found by valgrind
14590 Junio C Hamano (4):
14591 ls-tree: add --full-tree option
14592 Teach format-patch to handle output directory relative to cwd
14593 send-pack: do not send unknown object name from ".have" to pack-objects
14596 Marcel M. Cary (1):
14597 git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
14599 Markus Heidelberg (2):
14600 git-commit: color status output when color.ui is set
14601 git-status -v: color diff output when color.ui is set
14603 Nanako Shiraishi (1):
14604 Document git-ls-tree --full-tree
14606 Nguyễn Thái Ngọc Duy (2):
14607 grep: support --no-ext-grep to test builtin grep
14608 grep: grep cache entries if they are "assume unchanged"
14611 objects to be pruned immediately don't have to be loosened
14614 Version v1.6.1.1; changes since v1.6.1:
14615 ---------------------------------------
14618 git-shortlog.txt: improve documentation about .mailmap files
14619 git-send-email.txt: move --format-patch paragraph to a proper location
14621 Anders Melchiorsen (4):
14622 Documentation: git push repository can also be a remote
14623 Documentation: remove a redundant elaboration
14624 Documentation: mention branches rather than heads
14625 Documentation: avoid using undefined parameters
14627 Boyd Stephen Smith Jr (1):
14628 Fix Documentation for git-describe
14630 Christian Couder (1):
14631 builtin-fsck: fix off by one head count
14633 Clemens Buchacher (4):
14634 modify/delete conflict resolution overwrites untracked file
14635 unpack-trees: handle failure in verify_absent
14636 unpack-trees: fix path search bug in verify_absent
14637 unpack-trees: remove redundant path search in verify_absent
14639 Devin Doucette (1):
14640 gitweb: Fix export check in git_get_projects_list
14642 Felipe Contreras (1):
14643 fast-import: Cleanup mode setting.
14646 Use capitalized names where appropriate
14647 Be consistent in switch usage for tar
14650 Git.pm: call Error::Simple() properly
14653 README: tutorial.txt is now called gittutorial.txt
14655 Johannes Schindelin (7):
14656 merge-recursive: mark rename/delete conflict as unmerged
14657 bisect view: call gitk if Cygwin's SESSIONNAME variable is set
14658 git add: do not add files from a submodule
14659 http-push: fix off-by-path_len
14660 http-push: when making directories, have a trailing slash in the path name
14661 t5540: clarify that http-push does not handle packed-refs on the remote
14662 Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
14664 Junio C Hamano (8):
14665 merge-recursive: do not clobber untracked working tree garbage
14666 Prepare for v1.6.1.1 maintenance release
14667 builtin-apply: prevent non-explicit permission changes
14668 git checkout: do not allow switching to a tree-ish that is not a commit
14669 format-patch: show patch text for the root commit
14670 Update draft release notes to 1.6.1.1
14671 Update draft release notes for 1.6.1.1
14674 Kirill A. Korinskiy (1):
14675 http-push: support full URI in handle_remote_ls_ctx()
14677 Lars Noschinski (1):
14678 shell: Document that 'cvs server' is a valid command
14680 Markus Heidelberg (2):
14681 doc/git-send-email: mention sendemail.cc config variable
14682 Documentation: let asciidoc align related options
14684 Michael J Gruber (2):
14685 add test cases for "git mv -k"
14686 fix handling of multiple untracked files for git mv -k
14689 fast-export: print usage when no options specified
14690 Make t3411 executable
14693 configure clobbers LDFLAGS
14695 Philippe Bruhat (1):
14696 Git.pm: correctly handle directory name that evaluates to "false"
14698 Pierre Habouzit (1):
14699 Avoid spurious error messages on error mistakes.
14702 daemon: handle freopen() failure
14703 daemon: cleanup: replace loop with if
14704 daemon: cleanup: factor out xstrdup_tolower()
14705 merge-file: handle freopen() failure
14706 pretty: factor out skip_empty_lines()
14707 pretty: factor out format_subject()
14708 pretty: support multiline subjects with format:
14709 shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
14711 Shawn O. Pearce (1):
14712 describe: Avoid unnecessary warning when using --all
14715 t3501: check that commits are actually done
14716 t3404: Add test case for aborted --continue after "edit"
14717 t3404: Add test case for auto-amending only edited commits after "edit"
14718 builtin-commit.c: do not remove COMMIT_EDITMSG
14719 githooks.txt: add missing word
14722 diff: accept -- when using --no-index
14723 diff --no-index: test for pager after option parsing
14724 diff --no-index -q: fix endless loop
14726 jidanni@jidanni.org (4):
14727 Documentation/diff-options.txt: unify options
14728 Documentation/git-tag.txt: minor typo and grammar fix
14729 Documentation/git-push.txt: minor: compress one option
14730 contrib/examples/README: give an explanation of the status of these files
14733 Version v1.6.1; changes since v1.6.1-rc4:
14734 -----------------------------------------
14736 Johannes Schindelin (1):
14737 rebase -i -p: leave a --cc patch when a merge could not be redone
14740 Show a failure of rebase -p if the merge had a conflict
14741 rebase -i -p: Fix --continue after a merge could not be redone
14743 Junio C Hamano (1):
14747 t9129: skip the last three tests if UTF-8 locale is not available
14750 Version v1.6.1-rc4; changes since v1.6.1-rc3:
14751 ---------------------------------------------
14753 Alexander Gavrilov (2):
14754 git-gui: Fix handling of relative paths in blame.
14755 git-gui: Fix commit encoding handling.
14757 Arjen Laarhoven (1):
14758 Enable threaded delta search on Mac OS X/Darwin
14760 Boyd Stephen Smith Jr (1):
14761 git-revert documentation: refer to new HOWTO on reverting faulty merges
14763 Christian Stimming (3):
14764 git-gui: Update German (completed) translation.
14765 gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
14766 gitk: Update German translation
14769 git-mergetool: properly handle "git mergetool -- filename"
14771 Fredrik Skolmli (1):
14772 git-gui: Starting translation for Norwegian
14774 Giuseppe Bilotta (1):
14775 gitk: Map / to focus the search box
14777 Johannes Schindelin (3):
14778 fast-import: close pack before unlinking it
14779 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
14780 fast-export: deal with tag objects that do not have a tagger
14783 gitk: Use check-buttons' -text property instead of separate labels
14784 gitk: Ensure that "Reset branch" menu entry is enabled
14785 gitk: Force the focus to the main window on Windows
14787 Junio C Hamano (12):
14788 git-show: do not segfault when showing a bad tag
14789 pager: do not dup2 stderr if it is already redirected
14790 gitweb: do not run "git diff" that is Porcelain
14792 gitweb: do not run "git diff" that is Porcelain
14793 make_absolute_path(): check bounds when seeing an overlong symlink
14794 builtin-blame.c: use strbuf_readlink()
14795 combine-diff.c: use strbuf_readlink()
14796 fast-import: make tagger information optional
14797 Make sure lockfiles are unlocked when dying on SIGPIPE
14798 send-email: futureproof split_addrs() sub
14802 gitk: Allow unbalanced quotes/braces in commit headers
14804 Kirill A. Korinskiy (1):
14805 Remove the requirement opaquelocktoken uri scheme
14808 bash completion: Sort config completion variables
14809 bash completion: Sync config variables with their man pages
14811 Linus Torvalds (5):
14812 Add generic 'strbuf_readlink()' helper function
14813 Make 'ce_compare_link()' use the new 'strbuf_readlink()'
14814 Make 'index_path()' use 'strbuf_readlink()'
14815 Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
14816 Make 'prepare_temp_file()' ignore st_size for symlinks
14818 Marcel M. Cary (1):
14819 git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
14821 Markus Heidelberg (7):
14822 Documentation: fix description for enabling hooks
14823 doc/git-reset: add reference to git-stash
14824 Documentation: sync example output with git output
14825 Documentation: fix typos, grammar, asciidoc syntax
14826 Documentation: fix typos, grammar, asciidoc syntax
14827 Documentation/git-show-branch: work around "single quote" typesetting glitch
14828 doc/git-fsck: change the way for getting heads' SHA1s
14830 Michael J Gruber (1):
14831 test overlapping ignore patterns
14833 Michele Ballabio (1):
14834 git gui: update Italian translation
14837 git-gui: Update Hungarian translation for 0.12
14838 git-daemon documentation: use {tilde}
14839 githooks documentation: add a note about the +x mode
14840 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
14842 Nanako Shiraishi (3):
14843 git-gui: Update Japanese translation for 0.12
14844 Clarify documentation of "git checkout <tree-ish> paths" syntax
14845 Add a documentat on how to revert a faulty merge
14847 Paul Mackerras (1):
14848 gitk: Fix bugs in blaming code
14850 Peter Krefting (2):
14851 git-gui: Updated Swedish translation (515t0f0u).
14852 git-gui: Fixed typos in Swedish translation.
14855 Fix type-mismatch compiler warning from diff_populate_filespec()
14856 connect.c: stricter port validation, silence compiler warning
14857 fast-import.c: stricter strtoul check, silence compiler warning
14859 Richard Hartmann (2):
14860 Make help entries alphabetical
14861 Always show which directory is not a git repository
14863 Robin Rosenberg (1):
14864 git-revert: record the parent against which a revert was made
14866 Shawn O. Pearce (2):
14867 git-gui: Update po template to include 'Mirroring %s' message
14871 git-send-email: handle email address with quoted comma
14874 Version v1.6.1-rc3; changes since v1.6.1-rc2:
14875 ---------------------------------------------
14877 Alexander Gavrilov (1):
14878 Documentation: Describe git-gui Tools menu configuration options.
14880 Alexander Potashev (2):
14881 Fix typos in documentation
14882 Fix typo in comment in builtin-add.c
14884 Alexey Borzenkov (1):
14885 Define linkgit macro in [macros] section
14888 git-branch: display sha1 on branch deletion
14891 git-svn: Make following parents atomic
14893 Jakub Narebski (1):
14894 gitweb: Fix bug in insert_file() subroutine
14897 reorder ALLOW_TEXTCONV option setting
14898 diff: allow turning on textconv explicitly for plumbing
14899 diff: fix handling of binary rewrite diffs
14900 diff: respect textconv in rewrite diffs
14901 rebase: improve error messages about dirty state
14904 git-config.txt: fix a typo
14906 Johannes Schindelin (1):
14907 Get rid of the last remnants of GIT_CONFIG_LOCAL
14909 Junio C Hamano (4):
14910 builtin-checkout.c: check error return from read_cache()
14911 read-cache.c: typofix in comment
14912 work around Python warnings from AsciiDoc
14915 Linus Torvalds (1):
14916 fsck: reduce stack footprint
14918 Markus Heidelberg (1):
14919 builtin-commit: remove unused message variable
14922 make sure packs to be replaced are closed beforehand
14924 Ralf Wildenhues (1):
14925 Improve language in git-merge.txt and related docs
14927 Tor Arvid Lund (1):
14928 git-p4: Fix regression in p4Where method.
14930 YONETANI Tomokazu (1):
14931 git-fast-import possible memory corruption problem
14934 Version v1.6.1-rc2; changes since v1.6.1-rc1:
14935 ---------------------------------------------
14938 Make some of fwrite/fclose/write/close failures visible
14939 Make chdir failures visible
14940 Report symlink failures in merge-recursive
14942 Alexander Gavrilov (2):
14943 gitk: Make line origin search update the busy status
14944 gitk: Add a menu option to start git gui
14946 Christian Couder (2):
14947 bisect: fix "git bisect skip <commit>" and add tests cases
14948 Documentation: describe how to "bisect skip" a range of commits
14950 Christian Stimming (1):
14951 gitk: Update German translation
14953 Davide Libenzi (1):
14954 xdiff: give up scanning similar lines early
14957 git-svn: Make branch use correct svn-remote
14959 Giuseppe Bilotta (2):
14960 gitweb: make gitweb_check_feature a boolean wrapper
14961 Update comment on gitweb_check/get_feature
14963 Jakub Narebski (2):
14964 gitweb: Fix handling of non-ASCII characters in inserted HTML files
14965 gitweb: Make project specific override for 'grep' feature work
14968 add stage to gitignore
14969 tag: delete TAG_EDITMSG only on successful tag
14972 t4030-diff-textconv: Make octal escape sequence more portable
14974 Junio C Hamano (17):
14975 builtin-rm.c: explain and clarify the "local change" logic
14976 git add --intent-to-add: fix removal of cached emptiness
14977 git add --intent-to-add: do not let an empty blob be committed by accident
14978 gitweb: fix 'ctags' feature check and others
14979 gitweb: rename gitweb_check_feature to gitweb_get_feature
14980 Makefile: introduce NO_PTHREADS
14981 Install git-stage in exec-path
14982 git-am --whitespace: do not lose the command line option
14983 git-am: propagate -C<n>, -p<n> options as well
14984 git-am: propagate --3way options as well
14985 Test that git-am does not lose -C/-p/--whitespace options
14986 git-am: rename apply_opt_extra file to apply-opt
14987 Update draft release notes to 1.6.1
14989 Update draft release notes for 1.6.1
14990 Revert "git-stash: use git rev-parse -q"
14991 Point "stale" 1.6.0.5 documentation from the main git documentation page
14993 Linus Torvalds (1):
14994 Add backslash to list of 'crud' characters in real name
14997 git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
14999 Matt McCutchen (1):
15000 "git diff <tree>{3,}": do not reverse order of arguments
15003 User's Manual: remove duplicated url at the end of Appendix B
15004 git-stash: use git rev-parse -q
15005 filter-branch: use git rev-parse -q
15006 lost-found: use git rev-parse -q
15007 pull: use git rev-parse -q
15008 rebase: use git rev-parse -q
15009 submodule: use git rev-parse -q
15010 http.c: use 'git_config_string' to get 'curl_http_proxy'
15012 Nguyễn Thái Ngọc Duy (1):
15013 Extend index to save more flags
15015 Paul Mackerras (3):
15016 gitk: Fix context menu items for generating diffs when in tree mode
15017 gitk: Highlight only when search type is "containing:".
15018 gitk: Fix bug in accessing undefined "notflag" variable
15021 Add a built-in alias for 'stage' to the 'add' command
15024 fetch-pack: Avoid memcpy() with src==dst
15026 Tor Arvid Lund (1):
15027 git-p4: Fix bug in p4Where method.
15030 Version v1.6.1-rc1; changes since v1.6.0.6:
15031 -------------------------------------------
15033 Abhijit Menon-Sen (1):
15034 Make cherry-pick use rerere for conflict resolution.
15037 Extend "checkout --track" DWIM to support more cases
15038 Remove calculation of the longest command name from where it is not used
15039 Remove useless memset of static command name lists in builtin-merge.c
15040 Make main_cmds and other_cmds local to builtin-help.c
15041 Allow git help work without PATH set
15042 list_commands: only call git_exec_path if it is needed
15043 Add help.autocorrect to enable/disable autocorrecting
15044 Cleanup remove_path
15045 Fix potentially dangerous uses of mkpath and git_path
15046 Fix handle leak in sha1_file/unpack_objects if there were damaged object data
15047 Fix t4030-diff-textconv.sh
15049 Alexander Gavrilov (58):
15050 git-gui: Support starting gitk from Gui Blame
15051 git-gui: Support passing blame to a parent commit.
15052 git-gui: Better positioning in Blame Parent Commit
15053 git-gui: Allow specifying an initial line for git gui blame.
15054 gitk: Add option to specify the default commit on command line
15055 gitk: Add menu item for calling git gui blame
15056 git-gui: Support resolving conflicts via the diff context menu.
15057 git-gui: Support calling merge tools.
15058 git-gui: Don't allow staging files with conflicts.
15059 git-gui: Support more merge tools.
15060 git-gui: Support conflict states _U & UT.
15061 git-gui: Reimplement and enhance auto-selection of diffs.
15062 git-gui: Make F5 reselect a diff, if an untracked file is selected.
15063 git-gui: Show special diffs for complex conflict cases.
15064 git-gui: Fix Blame Parent & Context for working copy lines.
15065 git-gui: Restore ability to Stage Working Copy for conflicts.
15066 gitk: Fix a bug in collapsing deeply nested trees
15067 git-gui: Add more integration options to citool.
15068 git-gui: Cleanup handling of the default encoding.
15069 git-gui: Add a menu of available encodings.
15070 git-gui: Allow forcing display encoding for diffs using a submenu.
15071 git-gui: Optimize encoding name resolution using a lookup table.
15072 git-gui: Support the encoding menu in gui blame.
15073 git-gui: Reenable staging unmerged files by clicking the icon.
15074 git-gui: Make Ctrl-T safe to use for conflicting files.
15075 git-gui: Fix the blame window shape.
15076 git-gui: Add a search command to the blame viewer.
15077 git-gui: Fix the blame viewer destroy handler.
15078 gitk: Enhance file encoding support
15079 gitk: Implement batch lookup and caching of encoding attrs
15080 gitk: Allow forcing branch creation if it already exists
15081 gitk: Fix file list context menu for merge commits
15082 builtin-blame: Reencode commit messages according to git-log rules.
15083 gitk: Allow starting gui blame for a specific line
15084 git-gui: Add a dialog that shows the OpenSSH public key.
15085 git-gui: Add a simple implementation of SSH_ASKPASS.
15086 Windows: Make OpenSSH properly detect tty detachment.
15087 gitweb: Use single implementation of export_ok check.
15088 gitweb: Add a per-repository authorization hook.
15089 gitweb: Fix mod_perl support.
15090 gitk: Add Return and Escape bindings to dialogs
15091 gitk: Make gitk dialog windows transient
15092 gitk: Make cherry-pick call git-citool on conflicts
15093 gitk: Implement a user-friendly Edit View dialog
15094 git-gui: Fix focus transition in the blame viewer.
15095 git-gui: Add the Show SSH Key item to the clone dialog.
15096 git-gui: Request blame metadata in utf-8.
15097 gitk: Add accelerators to frequently used menu commands
15098 gitk: Fix transient windows on Win32 and MacOS
15099 gitk: Fix commit encoding support
15100 Documentation: New GUI configuration and command-line options.
15101 git-gui: Implement system-wide configuration handling.
15102 git-gui: Fix the after callback execution in rescan.
15103 git-gui: Add a Tools menu for arbitrary commands.
15104 git-gui: Allow Tools request arguments from the user.
15105 git-gui: Implement automatic rescan after Tool execution.
15106 git-gui: Fix the search bar destruction handler.
15107 gitk: Avoid handling the Return key twice in Add Branch
15109 Alexandre Julliard (9):
15110 git.el: Improve error handling for commits.
15111 git.el: Remove the env parameter in git-call-process and git-call-process-string.
15112 git.el: Simplify handling of merge heads in the commit log-edit buffer.
15113 git.el: Properly handle merge commits in git-amend-commit.
15114 git.el: Fix git-amend-commit to support amending an initial commit.
15115 git.el: Never clear the status buffer, only update the files.
15116 git.el: Add an insert file command.
15117 git.el: Add possibility to mark files directly in git-update-status-files.
15118 git.el: Allow to commit even if there are no marked files.
15120 Anders Melchiorsen (2):
15121 wt-status: Split header generation into three functions
15122 wt-status: Teach how to discard changes in the working directory
15124 Andreas Ericsson (3):
15125 Teach "git diff -p" to locate PHP class methods
15126 git commit: Reformat output somewhat
15127 rebase: Support preserving merges in non-interactive mode
15129 Arjen Laarhoven (1):
15130 t6023-merge-file: Work around non-portable sed usage
15133 for-each-ref: `:short` format for `refname`
15136 remote.c: add a function for deleting a refspec array and use it (twice)
15137 dir.c: Avoid c99 array initialization
15138 t4018-diff-funcname: test syntax of builtin xfuncname patterns
15139 diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
15140 xdiff-interface.c: strip newline (and cr) from line before pattern matching
15141 Replace xmalloc/memset(0) pairs with xcalloc
15142 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
15143 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
15144 t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
15147 Make xdi_diff_outf interface for running xdiff_outf diffs
15148 Use strbuf for struct xdiff_emit_state's remainder
15149 Always initialize xpparam_t to 0
15150 Allow alternate "low-level" emit function from xdl_diff
15152 Brian Gernhardt (2):
15153 format-patch: autonumber by default
15154 Avoid using non-portable `echo -n` in tests.
15157 git-remote: match usage string with the manual pages
15158 git-remote: add verbose mode to git remote update
15160 Christian Couder (10):
15161 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
15162 bisect: test merge base if good rev is not an ancestor of bad rev
15163 bisect: only check merge bases when needed
15164 bisect: remove "checkout_done" variable used when checking merge bases
15165 refs: improve comments about "reading" argument of "resolve_ref"
15166 bisect: fix missing "exit"
15167 Documentation: user-manual: add information about "git help" at the beginning
15168 Documentation: tutorial: add information about "git help" at the beginning
15169 git-gui: french translation update
15170 bisect: teach "skip" to accept special arguments like "A..B"
15172 Christian Stimming (5):
15173 git-gui: Mark forgotten strings for translation.
15174 git-gui: I18n fix sentence parts into full sentences for translation again.
15175 git-gui: Updated German translation.
15176 gitk: Add untranslated error messages to translation
15177 git-gui: Update German translation.
15180 git-merge documentation: more details about resolving conflicts
15183 Fix non-literal format in printf-style calls
15186 git-submodule: replace duplicated code with a module_list function
15187 git-submodule: add "sync" command
15188 tests: add a testcase for "git submodule sync"
15191 Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
15193 David M. Syzdek (5):
15194 Build: add NO_UINTMAX_T to support ancient systems
15195 Add Makefile check for FreeBSD 4.9-SECURITY
15196 autoconf: Add link tests to each AC_CHECK_FUNC() test
15197 Make Pthread link flags configurable
15198 Add autoconf tests for pthreads
15200 David Soria Parra (1):
15201 cast pid_t's to uintmax_t to improve portability
15204 git-diff: Add --staged as a synonym for --cached.
15206 Davide Libenzi (1):
15207 xdiff: give up scanning similar lines early
15210 git-svn: testcase for partial rebuild
15211 git-svn: do a partial rebuild if rev_map is out-of-date
15212 git-svn: proper detection of bare repositories
15213 git-svn: proper detection of bare repositories
15215 Dmitry Potapov (14):
15216 teach index_fd to work with pipes
15217 correct argument checking test for git hash-object
15218 correct usage help string for git-hash-object
15219 use parse_options() in git hash-object
15220 add --path option to git hash-object
15221 add --no-filters option to git hash-object
15222 mingw: remove use of _getdrive() from lstat/fstat
15223 add have_git_dir() function
15224 mingw: move common functionality to win32.h
15225 cygwin: Use native Win32 API for stat
15226 do not segfault if make_cache_entry failed
15227 print an error message for invalid path
15228 check-attr: add an internal check_attr() function
15229 check-attr: Add --stdin option
15232 Use xmalloc() and friends to catch allocation failures
15235 git-svn: check error code of send_txstream
15236 t9124: clean up chdir usage
15237 git-svn: fix handling of even funkier branch names
15238 git-svn: don't escape tilde ('~') for http(s) URLs
15239 git-svn: respect i18n.commitencoding config
15240 git-svn: don't escape tilde ('~') for http(s) URLs
15241 git-svn: respect i18n.commitencoding config
15243 Florian Ragwitz (1):
15244 Add git-svn branch to allow branch creation in SVN repositories
15246 Florian Weimer (3):
15247 git-svn: extract base blob in generate_diff
15248 git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
15249 git-svn: Send deltas during commits
15251 Fredrik Skolmli (1):
15252 Documentation: Spelling fix
15255 Fixed some grammatical errors in git-rebase.txt documentation.
15257 Giovanni Funchal (1):
15258 configure: auto detect dynamic library path switches
15260 Giuseppe Bilotta (12):
15261 gitweb: ref markers link to named shortlogs
15262 gitweb: shortlog now also obeys $hash_parent
15263 gitweb: refactor input parameters parse/validation
15264 gitweb: parse project/action/hash_base:filename PATH_INFO
15265 gitweb: generate project/action/hash URLs
15266 gitweb: use_pathinfo filenames start with /
15267 gitweb: parse parent..current syntax from PATH_INFO
15268 gitweb: generate parent..current URLs
15269 gitweb: make the supported snapshot formats array global
15270 gitweb: retrieve snapshot format from PATH_INFO
15271 gitweb: embed snapshot format parameter in PATH_INFO
15272 git-gui: try to provide a window icon under X
15274 Gustaf Hendeby (2):
15275 Update .gitignore to ignore git-help
15276 git-gui: Teach git gui about file type changes
15279 diff --dirstat-by-file: count changed files, not lines
15281 Jakub Narebski (1):
15282 gitweb: Better processing format string in custom links in navbar
15285 Introduce receive.denyDeletes
15288 run-command: add pre-exec callback
15289 spawn pager via run_command interface
15290 format-patch: use default diff format even with patch options
15291 tests: grep portability fixes
15292 reformat informational commit message
15293 tutorial: update output of git commit
15294 tests: shell negation portability fix
15295 t4012: use test_cmp instead of cmp
15296 diff: unify external diff and funcname parsing code
15297 diff: introduce diff.<driver>.binary
15298 diff: add filter for converting binary to text
15299 document "intent to add" option to git-add
15300 rm: loosen safety valve for empty files
15301 submodule: fix some non-portable grep invocations
15302 diff: add missing static declaration
15303 document the diff driver textconv feature
15304 refactor userdiff textconv code
15305 userdiff: require explicitly allowing textconv
15306 only textconv regular files
15307 wt-status: load diff ui config
15308 add userdiff textconv tests
15309 enable textconv for diff in verbose status/commit
15310 t5400: expect success for denying deletion
15311 t5516: refactor oddball tests
15312 receive-pack: detect push to current branch of non-bare repo
15313 define empty tree sha1 as a macro
15314 wt-status: refactor initial commit printing
15315 status: show "-v" diff even for initial commit
15318 add boolean diff.suppress-blank-empty config option
15319 SubmittingPatches: fix a typo
15320 reword --full-index description
15321 xdiff-interface.c: remove 10 duplicated lines
15324 git-daemon: set REMOTE_ADDR to client address
15325 sha1_file: avoid bogus "file exists" error message
15328 Teach "git diff -p" HTML funcname patterns
15329 Fix AsciiDoc errors in merge documentation
15330 Fix submodule sync with relative submodule URLs
15332 Johannes Schindelin (7):
15333 t9700: remove useless check
15334 tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
15335 Enable parallel tests
15336 checkout --track: make up a sensible branch name if '-b' was omitted
15337 test-lib: do not remove trash_directory if called with --debug
15338 git wrapper: DWIM mistyped commands
15339 Document levenshtein.c
15341 Johannes Sixt (11):
15342 Revert "Windows: Use a customized struct stat that also has the st_blocks member."
15343 filter-branch: Grok special characters in tag names
15344 Windows: git-shell can be compiled again
15345 compat/mingw: Support a timeout in the poll emulation if no fds are given
15346 git-gui: Do not automatically stage file after merge tool finishes
15347 git-gui: Remove space from the end of aspell's reply before processing
15348 git-gui: Fix switch statement in lib/merge.tcl
15349 git-gui: Show a round number of bytes of large untracked text files
15350 git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
15351 git-remote: list branches in vertical lists
15352 git-gui: Do not munge conflict marker lines in a normal diff
15355 git-p4: Support purged files and optimize memory usage
15356 git-p4: Cache git config for performance
15359 git-check-attr(1): use 'verse' for multi-line synopsis sections
15361 Jonathan del Strother (3):
15362 Revert "Convert output messages in merge-recursive to past tense."
15363 Add OS X support to the pre-auto-gc example hook
15364 Teach git diff about Objective-C syntax
15366 Joshua Williams (1):
15367 git-gui: Add support for calling out to the prepare-commit-msg hook
15369 Junio C Hamano (78):
15370 builtin-add.c: restructure the code for maintainability
15371 builtin-add.c: optimize -A option and "git add ."
15372 imap-send.c: more style fixes
15373 documentation: merge-base: explain "git merge-base" with more than 2 args
15374 merge-base-many: add trivial tests based on the documentation
15375 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
15376 revision.c: whitespace fix
15377 revision traversal: show full history with merge simplification
15378 Topo-sort before --simplify-merges
15379 update-index: refuse to add working tree items beyond symlinks
15380 add: refuse to add working tree items beyond symlinks
15381 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
15382 revision --simplify-merges: use decoration instead of commit->util field
15383 index: future proof for "extended" index entries
15384 tests: use $TEST_DIRECTORY to refer to the t/ directory
15386 Makefile: Allow CC_LD_DYNPATH to be overriden
15387 revision --simplify-merges: do not leave commits unprocessed
15388 revision --simplify-merges: make it a no-op without pathspec
15389 compat: introduce on_disk_bytes()
15390 shell: do not play duplicated definition games to shrink the executable
15391 Build-in "git-shell"
15392 Update draft release notes for 1.6.1
15393 Fix "git-merge -s bogo" help text
15394 templates/Makefile: install is unnecessary, just use mkdir -p
15395 t7606: fix custom merge test
15396 Revert "Build-in "git-shell""
15397 daemon.c: minor style fixup
15398 checkout -f: allow ignoring unmerged paths when checking out of the index
15399 checkout --ours/--theirs: allow checking out one side of a conflicting merge
15400 xdl_fill_merge_buffer(): separate out a too deeply nested function
15401 xdiff-merge: optionally show conflicts in "diff3 -m" style
15402 xmerge.c: minimum readability fixups
15403 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
15404 rerere.c: use symbolic constants to keep track of parsing states
15405 rerere: understand "diff3 -m" style conflicts with the original
15406 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
15407 git-merge-recursive: learn to honor merge.conflictstyle
15408 checkout -m: recreate merge when checking out of unmerged index
15409 diff: vary default prefix depending on what are compared
15410 git commit --author=$name: look $name up in existing commits
15411 git-add --intent-to-add (-N)
15412 checkout --conflict=<style>: recreate merge in a non-default style
15413 git-merge documentation: describe how conflict is presented
15414 Update draft release notes for 1.6.1
15415 safe_create_leading_directories(): make it about "leading" directories
15416 git-apply:--include=pathspec
15417 Update draft release notes for 1.6.1
15418 daemon.c: avoid setlinebuf()
15419 is_directory(): a generic helper function
15420 receive-pack: make it a builtin
15421 push: prepare sender to receive extended ref information from the receiver
15422 push: receiver end advertises refs from alternate repositories
15423 Fix git-diff-tree --stdin
15424 diff: use extended regexp to find hunk headers
15425 diff: fix "multiple regexp" semantics to find hunk header comment
15426 Update draft release notes to 1.6.1
15427 t5510: test "git fetch" following tags minimally
15428 Update draft release notes to 1.6.1
15429 Fix reading of cloud tags
15430 Update draft release notes for 1.6.1
15431 Fix mismerge at cdb22c4 in builtin-checkout.c
15432 rebase-i-p: minimum fix to obvious issues
15433 git-rebase--interactive.sh: comparision with == is bashism
15434 receive-pack: fix "borrowing from alternate object store" implementation
15435 compat/cygwin.c: make runtime detection of lstat/stat lessor impact
15436 Stop using compat/regex.c on platforms with working regexp library
15437 Update draft release notes to 1.6.1
15438 Update draft release notes to 1.6.1
15439 Update draft release notes to 1.6.1
15440 t5303: work around printf breakage in dash
15441 t5303: fix printf format string for portability
15442 git.html: Update the links to stale versions
15443 Update draft release notes to 1.6.1
15444 builtin-remote.c: plug a small memory leak in get_one_remote_for_updates()
15445 send-email: do not reverse the command line arguments
15446 Include git-gui--askpass in git-gui RPM package
15449 Karl Hasselström (4):
15450 Refactoring: Split up diff_tree_stdin
15451 diff-tree: Note that the commit ID is printed with --stdin
15452 Teach git diff-tree --stdin to diff trees
15453 Add test for diff-tree --stdin with two trees
15455 Kirill Smelkov (1):
15456 Teach "git diff -p" Python funcname patterns
15459 bash completion: Add 'workflows' to 'git help'
15460 workflows documentation: fix link to git-request-pull[1]
15462 Linus Torvalds (8):
15463 date/time: do not get confused by fractional seconds
15464 Add a 'source' decorator for commits
15465 revision: make tree comparison functions take commits rather than trees
15466 Make '--decorate' set an explicit 'show_decorations' flag
15467 revision traversal: '--simplify-by-decoration'
15468 Add cache preload facility
15469 Fix machine-parseability of 'git log --source'
15470 Fix index preloading for racy dirty case
15472 Marcel Koeppen (1):
15473 t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
15476 count-objects: Add total pack size to verbose output
15477 Update t/.gitignore to ignore all trash directories
15479 Marek Zawirski (1):
15480 Make push more verbose about illegal combination of options
15483 Documentation: rev-list-options.txt: added --branches, --tags & --remotes.
15484 git-commit.txt - mention that files listed on the command line must be known to git.
15487 git-submodule - Add 'foreach' subcommand
15488 git-submodule.sh - Remove trailing / from URL if found
15489 git-submodule.sh - Remove trailing / from URL if found
15490 git-submodule - Use "get_default_remote" from git-parse-remote
15491 compat/cygwin.c - Use cygwin's stat if core.filemode == true
15493 Markus Heidelberg (1):
15494 Makefile: add install-man rules (quick and normal)
15496 Marten Svanfeldt (dev) (2):
15497 Git.pm: Make _temp_cache use the repository directory
15498 git-svn: Update git-svn to use the ability to place temporary files within repository directory
15500 Matt McCutchen (2):
15501 "git diff <tree>{3,}": do not reverse order of arguments
15502 git-merge-recursive: honor merge.conflictstyle once again
15504 Matthias Kestenholz (1):
15505 bash-completion: Add all submodule subcommands to the completion list
15507 Michael J Gruber (3):
15508 allow installation of man and html doc from the man and html branches
15509 separate build targets for man and html documentation
15510 make prune report removed objects on -v
15512 Michael Witten (9):
15513 Docs: send-email's usage text and man page mention same options
15514 Docs: send-email usage text much sexier
15515 Docs: send-email: Man page option ordering
15516 send-email: change --no-validate to boolean --[no-]validate
15517 Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
15518 Docs: send-email: Remove unnecessary config variable description
15519 Docs: send-email: Create logical groupings for --help text
15520 Docs: send-email: Create logical groupings for man text
15521 send-email: signedoffcc -> signedoffbycc, but handle both
15523 Michele Ballabio (1):
15524 git gui: update Italian translation
15526 Mikael Magnusson (1):
15527 Correct output of git-count-objects.
15530 gitweb: Sort the list of forks on the summary page by age
15533 builtin-help: make some internal functions available to other builtins
15534 builtin-merge: allow using a custom strategy
15535 Add a new test for using a custom merge strategy
15536 Add a second testcase for handling invalid strategies in git-merge
15537 builtin-help: always load_command_list() in cmd_help()
15539 Split out merge_recursive() to merge-recursive.c
15540 merge-recursive: introduce merge_options
15541 builtin-merge: avoid run_command_v_opt() for recursive and subtree
15542 cherry-pick/revert: make direct internal call to merge_tree()
15543 merge-recursive: move call_depth to struct merge_options
15544 merge-recursive: get rid of the index_only global variable
15545 merge-recursive: move the global obuf to struct merge_options
15546 merge-recursive: move current_{file,directory}_set to struct merge_options
15547 merge-recursive: get rid of virtual_id
15548 builtin-merge: release the lockfile in try_merge_strategy()
15549 commit_tree(): add a new author parameter
15550 builtin-commit: use commit_tree()
15551 t7603: add new testcases to ensure builtin-commit uses reduce_heads()
15552 builtin-merge: refresh the index before calling a strategy
15553 builtin-commit: use reduce_heads() only when appropriate
15554 Cleanup in sha1_file.c::cache_or_unpack_entry()
15555 Implement git clone -v
15556 Add Linux PPC support to the pre-auto-gc example hook
15557 parse-opt: migrate builtin-checkout-index.
15558 Implement git remote rename
15559 remote: add a new 'origin' variable to the struct
15560 git-remote rename: migrate from remotes/ and branches/
15561 git-remote: document the migration feature of the rename subcommand
15562 Update Hungarian translation. 100% completed.
15563 builtin-branch: use strbuf in delete_branches()
15564 builtin-branch: use strbuf in fill_tracking_info()
15565 builtin-branch: use strbuf in rename_branch()
15566 builtin-clone: use strbuf in guess_dir_name()
15567 builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
15568 builtin_clone: use strbuf in cmd_clone()
15570 Nanako Shiraishi (22):
15571 t/t91XX-svn: start removing use of "git-" from these tests
15572 t/t91XX git-svn tests: run "git svn" not "git-svn"
15573 t9200: use "git cvsexportcommit" without dash
15574 t9300, t9301: use "git fast-import/fast-export" without dash
15575 t9700: use "git config" without dash
15576 tests: use "git foo" without dash in strings
15577 t9101: use "git hash-object" without dash
15578 Install git-cvsserver in $(bindir)
15579 remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
15580 graph.c: make many functions static
15581 usage.c: remove unused functions
15582 Add contrib/rerere-train script
15583 dir.c: make dir_add_name() and dir_add_ignored() static
15584 run-command.c: remove run_command_v_opt_cd()
15585 config.c: make git_parse_long() static
15586 commit.c: make read_graft_file() static
15587 archive.c: make archiver static
15589 rebase: Document --no-verify option to bypass pre-rebase hook
15590 Document "git log --source"
15591 Document "git log --simplify-by-decoration"
15592 git-gui: update Japanese translation
15595 config.mak.in: Pass on LDFLAGS from configure
15597 Nicolas Pitre (18):
15598 sha1write: don't copy full sized buffers
15599 pack-objects: don't include missing preferred base objects
15600 t5300: improve SHA1 collision test
15601 fix openssl headers conflicting with custom SHA1 implementations
15602 index-pack: rationalize delta resolution code
15603 index-pack: smarter memory usage during delta resolution
15604 fix multiple issues in index-pack
15605 improve index-pack tests
15606 index-pack: don't leak leaf delta result
15607 close another possibility for propagating pack corruption
15608 better validation on delta base object offsets
15609 make unpack_object_header() non fatal
15610 make packed_object_info() resilient to pack corruptions
15611 make check_object() resilient to pack corruptions
15612 make find_pack_revindex() aware of the nasty world
15613 pack-objects: allow "fixing" a corrupted pack without a full repack
15614 extend test coverage for latest pack corruption resilience improvements
15615 pack-objects: don't leak pack window reference when splitting packs
15618 provide more errors for the "merge into empty head" case
15620 Paul Mackerras (17):
15621 gitk: Use <Button-2> for context menus on OSX
15622 gitk: Clean up file encoding code and add enable/disable option
15623 gitk: Fix binding for <Return> in sha1 entry field
15624 gitk: New way of constructing menus that allows for Alt+letter accelerators
15625 gitk: Regenerate .po files
15626 gitk: Turn short SHA1 names into links too
15627 gitk: Fix some off-by-one errors in computing which line to blame
15628 gitk: Add a menu item to show where a given line comes from
15629 gitk: Make the background color of marked lines configurable
15630 gitk: Unify handling of merge diffs with normal 2-way diffs
15631 gitk: Make "show origin of this line" work on fake commits
15632 gitk: Cope with unmerged files in local changes
15633 gitk: Improve cherry-pick error handling
15634 gitk: Fix linehtag undefined error with file highlighting
15635 gitk: Index line[hnd]tag arrays by id rather than row number
15636 gitk: Fix switch statement in parseviewargs
15637 gitk: Show local changes properly when we have a path limit
15640 git-svn: set auto_props when renaming files
15643 contrib/hooks/post-receive-email: Put rev display in separate function
15644 contrib/hooks/post-receive-email: Make revision display configurable
15646 Peter Krefting (1):
15647 Updated Swedish translation (514t0f0u).
15649 Peter Valdemar Mørch (2):
15650 Teach git log --check to return an appropriate exit code
15651 Teach git log --exit-code to return an appropriate exit code
15654 git-web--browse: Support for using /bin/start on MinGW
15655 git-gui: Clarify the Remote -> Delete... action
15656 git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
15657 git-gui: Add support for adding remotes
15658 git-gui: Add support for removing remotes
15659 git-gui: mkdir -p when initializing new remote repository
15660 git-gui: Use git web--browser for web browsing
15661 git-gui: Add Explore Working Copy to the Repository menu
15662 git-gui: gui.autoexplore makes explorer to pop up automatically after picking
15663 git-gui: Avoid using the term URL when specifying repositories
15664 git-gui: Make input boxes in init/clone/open dialogs consistent
15665 git-gui: Fix removing non-pushable remotes
15666 git-gui: Fix fetching from remotes when adding them
15667 gitweb: Clean-up sorting of project list
15668 gitweb: Quote non-displayable characters in hex, not octal
15669 config.c: Tolerate UTF8 BOM at the beginning of config file
15670 gitweb: Identify all summary metadata table rows
15671 gitweb: Add support for extending the action bar with custom links
15672 gitweb: Support for tag clouds
15673 gitweb: Make the by_tag filter delve in forks as well
15674 gitweb: Support for simple project search form
15675 Do not rename read-only files during a push
15677 Pierre Habouzit (8):
15678 Enable threaded delta search on *BSD and Linux.
15679 parse-opt: migrate fmt-merge-msg.
15680 parse-opt: migrate git-merge-base.
15681 parse-opt: migrate builtin-merge-file.
15682 git send-email: make the message file name more specific.
15683 git send-email: interpret unknown files as revision lists
15684 git send-email: add --annotate option
15685 git send-email: ask less questions when --compose is used.
15688 builtin-reflog: Allow reflog expire to name partial ref
15689 builtin-commit.c: show on which branch a commit was added
15690 git wrapper: also use aliases to correct mistyped commands
15693 Update RPM spec for the new location of git-cvsserver.
15695 Ralf Wildenhues (2):
15696 Correct typos in RelNotes-1.6.1
15697 Fix typos in the documentation.
15699 Raphael Zimmerer (1):
15700 git grep: Add "-z/--null" option as in GNU's grep.
15703 log: add load_ref_decorations()
15704 move load_ref_decorations() to log-tree.c and export it
15705 add '%d' pretty format specifier to show decoration
15706 add alloc_ref_with_prefix()
15707 use alloc_ref_from_str() everywhere
15708 make alloc_ref_from_str() the new alloc_ref()
15709 blame: inline get_patch()
15710 add xdi_diff_hunks() for callers that only need hunk lengths
15711 blame: use xdi_diff_hunks(), get rid of struct patch
15712 add strbuf_expand_dict_cb(), a helper for simple cases
15713 merge-recursive: use strbuf_expand() instead of interpolate()
15714 daemon: use strbuf_expand() instead of interpolate()
15715 daemon: inline fill_in_extra_table_entries()
15716 daemon: deglobalize variable 'directory'
15717 remove the unused files interpolate.c and interpolate.h
15720 gitk: Bind Key-Return to create on new branch dialog
15722 Robert Shearman (4):
15723 git-imap-send: Allow the program to be run from subdirectories of a git tree
15724 git-imap-send: Support SSL
15725 imap-send.c: style fixes
15726 Documentation: Improve documentation for git-imap-send(1)
15728 Romain Francoise (1):
15729 builtin-help: fallback to GIT_MAN_VIEWER before man
15732 bash: use for-each-ref format 'refname:short'
15733 remove vim syntax highlighting in favor of upstream
15734 bash: complete full refs
15736 Samuel Tardieu (1):
15737 Fix deletion of last character in levenshtein distance
15740 rev-list documentation: clarify the two parts of history simplification
15742 Shawn O. Pearce (7):
15743 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
15744 git-gui: Hide commit related UI during citool --nocommit
15745 git-gui: Use gitattribute "encoding" for file content display
15746 git-gui: Assume `blame --incremental` output is in UTF-8
15747 git-gui: Show/hide "Sign Off" based on nocommitmsg option
15748 describe: Make --tags and --all match lightweight tags more often
15749 Update the po template
15751 Simon Hausmann (1):
15752 Make it possible to abort the submission of a change to Perforce
15755 Fix commit_tree() buffer leak
15756 merge-recursive.c: Add more generic merge_recursive_generic()
15758 Stephen Haberman (8):
15759 rebase--interactive: fix parent rewriting for dropped commits
15760 rebase-i-p: test to exclude commits from todo based on its parents
15761 rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
15762 rebase-i-p: delay saving current-commit to REWRITTEN if squashing
15763 rebase-i-p: fix 'no squashing merges' tripping up non-merges
15764 rebase-i-p: only list commits that require rewriting in todo
15765 rebase-i-p: do not include non-first-parent commits touching UPSTREAM
15766 rebase-i-p: if todo was reordered use HEAD as the rewritten parent
15768 Stephen R. van den Berg (4):
15769 git-daemon: call logerror() instead of error()
15770 git-daemon: use LOG_PID, simplify logging code
15771 git-daemon: Simplify dead-children reaping logic
15772 git-daemon: rewrite kindergarden, new option --max-connections
15775 bash completion: Add --[no-]validate to "git send-email"
15778 filter-branch: Extend test to show rewriting bug
15779 filter-branch: fix ref rewriting with --subdirectory-filter
15780 filter-branch: use --simplify-merges
15781 Documentation: rev-list-options: move --simplify-merges documentation
15782 rev-list: fix --reverse interaction with --parents
15783 t6013: replace use of 'tac' with equivalent Perl
15784 git svn: catch lack of upstream info for dcommit earlier
15785 git svn info: tests: let 'init' test run with SVN 1.5
15786 git svn info: tests: do not use set -e
15787 git svn info: tests: use test_cmp instead of git-diff
15788 git svn info: tests: fix ptouch argument order in setup
15789 git svn info: make info relative to the current directory
15790 git svn info: always quote URLs in 'info' output
15791 git-svn: match SVN 1.5 behaviour of info' on unknown item
15792 git-svn: fix 'info' tests for unknown items
15793 Documentation: new upstream rebase recovery section in git-rebase
15794 Documentation: Refer to git-rebase(1) to warn against rewriting
15795 Documentation: remove stale howto/rebase-and-edit.txt
15796 Documentation: add manpage about workflows
15798 Tom Preston-Werner (1):
15799 connect.c: add a way for git-daemon to pass an error back to client
15801 Tommi Virtanen (1):
15802 Install git-shell in bindir, too
15804 Tor Arvid Lund (1):
15805 git-p4: Fix checkout bug when using --import-local.
15808 send-email: Fix Pine address book parsing
15811 Teach/Fix pull/fetch -q/-v options
15812 Retain multiple -q/-v occurrences in git pull
15815 Version v1.6.0.6; changes since v1.6.0.5:
15816 -----------------------------------------
15819 git-mergetool: properly handle "git mergetool -- filename"
15822 git-svn: Make following parents atomic
15825 git-config.txt: fix a typo
15827 Johannes Schindelin (2):
15828 fast-import: close pack before unlinking it
15829 fast-export: deal with tag objects that do not have a tagger
15831 Junio C Hamano (6):
15832 work around Python warnings from AsciiDoc
15833 git-show: do not segfault when showing a bad tag
15834 pager: do not dup2 stderr if it is already redirected
15835 gitweb: do not run "git diff" that is Porcelain
15837 fast-import: make tagger information optional
15839 Linus Torvalds (1):
15840 fsck: reduce stack footprint
15842 Markus Heidelberg (1):
15843 Documentation: fix typos, grammar, asciidoc syntax
15846 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
15849 make sure packs to be replaced are closed beforehand
15852 git-send-email: handle email address with quoted comma
15855 Version v1.6.0.5; changes since v1.6.0.4:
15856 -----------------------------------------
15858 Alexandre Julliard (2):
15859 checkout: Don't crash when switching away from an invalid branch.
15860 git-submodule: Avoid printing a spurious message.
15862 Brandon Casey (12):
15863 t7700: demonstrate mishandling of objects in packs with a .keep file
15864 packed_git: convert pack_local flag into a bitfield and add pack_keep
15865 pack-objects: new option --honor-pack-keep
15866 repack: don't repack local objects in packs with .keep file
15867 repack: do not fall back to incremental repacking with [-a|-A]
15868 builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
15869 t7700: demonstrate mishandling of loose objects in an alternate ODB
15870 sha1_file.c: split has_loose_object() into local and non-local counterparts
15871 pack-objects: extend --local to mean ignore non-local loose objects too
15872 t7700: test that 'repack -a' packs alternate packed objects
15873 repack: only unpack-unreachable if we are deleting redundant packs
15874 revision.c: use proper data type in call to sizeof() within xrealloc
15877 Fix misleading wording for git-cherry-pick
15879 Christian Couder (3):
15880 Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
15881 Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
15882 Documentation: fix links to "everyday.html"
15885 Fix non-literal format in printf-style calls
15887 Davide Libenzi (1):
15888 xdiff: give up scanning similar lines early
15890 Jakub Narebski (1):
15891 gitweb: Make project specific override for 'grep' feature work
15894 Documentation: git-svn: fix example for centralized SVN clone
15897 commit: Fix stripping of patch in verbose mode.
15898 tag: delete TAG_EDITMSG only on successful tag
15901 sha1_file: avoid bogus "file exists" error message
15903 Johannes Schindelin (1):
15904 fast-export: use an unsorted string list for extra_refs
15907 compat/mingw.c: Teach mingw_rename() to replace read-only files
15909 Junio C Hamano (8):
15910 Makefile: help people who run 'make check' by mistake
15911 checkout: Fix "initial checkout" detection
15912 Start 1.6.0.5 cycle
15913 builtin-ls-files.c: coding style fix.
15914 Teach ls-files --with-tree=<tree> to work with options other than -c
15915 Teach "git diff" to honour --[no-]ext-diff
15916 Update draft release notes to 1.6.0.5
15919 Linus Torvalds (1):
15920 date/time: do not get confused by fractional seconds
15922 Martin Koegler (1):
15923 git push: Interpret $GIT_DIR/branches in a Cogito compatible way
15926 Remove the period after the git-check-attr summary
15928 Matt McCutchen (3):
15929 config.txt: alphabetize configuration sections
15930 git checkout: don't warn about unborn branch if -f is already passed
15931 "git diff <tree>{3,}": do not reverse order of arguments
15934 Add new testcase to show fast-export does not always exports all tags
15935 User's Manual: remove duplicated url at the end of Appendix B
15936 http.c: use 'git_config_string' to get 'curl_http_proxy'
15938 Nguyễn Thái Ngọc Duy (1):
15939 generate-cmdlist.sh: avoid selecting synopsis at wrong place
15942 Fix pack.packSizeLimit and --max-pack-size handling
15945 git-p4: fix keyword-expansion regex
15947 Ralf Wildenhues (1):
15948 Fix typos in the documentation.
15951 bash: remove dashed command leftovers
15952 bash: offer refs instead of filenames for 'git revert'
15955 sha1_file.c: resolve confusion EACCES vs EPERM
15957 Samuel Tardieu (2):
15958 tag: Check that options are only allowed in the appropriate mode
15959 tag: Add more tests about mixing incompatible modes and options
15962 git ls-remote: make usage string match manpage
15963 request-pull: make usage string match manpage
15966 fetch-pack: Avoid memcpy() with src==dst
15969 Version v1.6.0.4; changes since v1.6.0.3:
15970 -----------------------------------------
15973 Add mksnpath which allows you to specify the output buffer
15974 Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
15975 Fix potentially dangerous uses of mkpath and git_path
15976 Plug a memleak in builtin-revert
15977 Add git_snpath: a .git path formatting routine with output buffer
15978 Fix potentially dangerous use of git_path in ref.c
15979 git_pathdup: returns xstrdup-ed copy of the formatted path
15980 Use git_pathdup instead of xstrdup(git_path(...))
15981 Add --verbose|-v to test-chmtime
15982 Use test-chmtime -v instead of perl in t5000 to get mtime of a file
15984 Charles Bailey (1):
15985 git-archive: work in bare repos
15987 Christian Jaeger (1):
15988 Git.pm: do not break inheritance
15990 Clemens Buchacher (2):
15991 do not force write of packed refs
15992 push: fix local refs update if already up-to-date
15995 git-svn: change dashed git-config to git config
15996 git-svn: change dashed git-commit-tree to git commit-tree
15998 Gustaf Hendeby (1):
15999 git-gui: Help identify aspell version on Windows too
16001 Jakub Narebski (1):
16002 Documentation/gitattributes: Add subsection header for each attribute
16005 Documentation: clarify information about 'ident' attribute
16008 refactor handling of "other" files in ls-files and status
16009 correct cache_entry allocation
16010 pack-objects: avoid reading uninitalized data
16011 fix overlapping memcpy in normalize_absolute_path
16012 send-pack: do not send out single-level refs such as refs/stash
16014 Johannes Schindelin (1):
16015 Fix fetch/pull when run without --update-head-ok
16018 asciidoc: add minor workaround to add an empty line after code blocks
16020 Junio C Hamano (9):
16021 pull: allow "git pull origin $something:$current_branch" into an unborn branch
16022 Fix "checkout --track -b newbranch" on detached HEAD
16023 reset --hard/read-tree --reset -u: remove unmerged new paths
16024 demonstrate breakage of detached checkout with symbolic link HEAD
16025 Enhance hold_lock_file_for_{update,append}() API
16026 Start 1.6.0.4 cycle
16027 Update draft 1.6.0.4 release notes
16028 format-patch documentation: mention the special case of showing a single commit
16031 Linus Torvalds (1):
16032 Add file delete/create info when we overflow rename_limit
16034 Markus Heidelberg (1):
16035 bash completion: add doubledash to "git show"
16037 Mikael Magnusson (1):
16038 Document that git-log takes --all-match.
16041 Fix git branch -m for symrefs.
16042 rename_ref(): handle the case when the reflog of a ref does not exist
16043 Fix git update-ref --no-deref -d.
16044 git branch -m: forbid renaming of a symref
16045 update-ref --no-deref -d: handle the case when the pointed ref is packed
16047 Nanako Shiraishi (1):
16048 Install git-cvsserver in $(bindir)
16050 Pierre Habouzit (1):
16051 git send-email: avoid leaking directory file descriptors.
16054 Update RPM spec for the new location of git-cvsserver.
16057 add -p: warn if only binary changes present
16059 Tom Preston-Werner (1):
16060 add instructions on how to send patches to the mailing list with Gmail
16062 Tommi Virtanen (1):
16063 Install git-shell in bindir, too
16066 Add reference for status letters in documentation.
16069 Version v1.6.0.3; changes since v1.6.0.2:
16070 -----------------------------------------
16072 Abhijit Bhopatkar (1):
16073 Documentation: Clarify '--signoff' for git-commit
16076 git-svn: factor out svnserve test code for later use
16077 git-svn: Always create a new RA when calling do_switch for svn://
16080 Remove empty directories in recursive merge
16081 Add remove_path: a function to remove as much as possible of a path
16082 Use remove_path from dir.c instead of own implementation
16084 Alexander Gavrilov (1):
16085 builtin-blame: Fix blame -C -C with submodules.
16087 Björn Steinbrink (1):
16088 force_object_loose: Fix memory leak
16090 Brandon Casey (14):
16091 t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
16092 t9700/test.pl: remove File::Temp requirement
16093 diff.c: return pattern entry pointer rather than just the hunk header pattern
16094 diff.c: associate a flag with each pattern and use it for compiling regex
16095 diff.*.xfuncname which uses "extended" regex's for hunk header selection
16096 t4018-diff-funcname: test syntax of builtin xfuncname patterns
16097 builtin-prune.c: prune temporary packs in <object_dir>/pack directory
16098 git-stash.sh: don't default to refs/stash if invalid ref supplied
16099 builtin-merge.c: allocate correct amount of memory
16100 git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
16101 remote.c: correct the check for a leading '/' in a remote name
16102 t4018-diff-funcname: rework negated last expression test
16103 t4018-diff-funcname: demonstrate end of line funcname matching flaw
16104 xdiff-interface.c: strip newline (and cr) from line before pattern matching
16106 Charles Bailey (2):
16107 Add new test to demonstrate git archive core.autocrlf inconsistency
16108 Make git archive respect core.autocrlf when creating zip format archives
16111 Documentation: clarify the details of overriding LESS via core.pager
16114 contrib: update packinfo.pl to not use dashed commands
16116 Daniel Barkalow (1):
16117 Check early that a new branch is new and valid
16119 David Soria Parra (1):
16120 Solaris: Use OLD_ICONV to avoid compile warnings
16123 maint: check return of split_cmdline to avoid bad config strings
16124 git init: --bare/--shared overrides system/global config
16126 Dmitry Potapov (4):
16127 git-rebase-interactive: do not squash commits on abort
16128 git-rebase--interactive: auto amend only edited commit
16129 make prefix_path() never return NULL
16130 do not segfault if make_cache_entry failed
16133 completion: git commit should list --interactive
16136 git-svn: fix handling of even funkier branch names
16138 Fabrizio Chiarello (1):
16139 builtin-clone: fix typo
16142 Clarified gitattributes documentation regarding custom hunk header.
16144 Giuseppe Bilotta (1):
16145 gitweb: remove PATH_INFO from $my_url and $my_uri
16148 Start conforming code to "git subcmd" style part 3
16149 Cosmetical command name fix
16152 builtin-apply: fix typo leading to stack corruption
16154 Jakub Narebski (2):
16155 gitweb: Fix two 'uninitialized value' warnings in git_tree()
16156 gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
16159 Makefile: do not set NEEDS_LIBICONV for Solaris 8
16160 git apply --directory broken for new files
16161 tests: shell negation portability fix
16164 gitweb: avoid warnings for commits without body
16167 for-each-ref: Fix --format=%(subject) for log message without newlines
16168 Use strchrnul() instead of strchr() plus manual workaround
16170 Johannes Schindelin (2):
16171 git rm: refresh index before up-to-date check
16172 rebase -i: do not fail when there is no commit to cherry-pick
16175 git-remote: do not use user input in a printf format string
16176 git-push.txt: Describe --repo option in more detail
16179 checkout: Do not show local changes when in quiet mode
16180 git-check-attr(1): add output and example sections
16182 Junio C Hamano (15):
16183 discard_cache: reset lazy name_hash bit
16184 diff Porcelain: do not disable auto index refreshing on -C -C
16185 diff --quiet: make it synonym to --exit-code >/dev/null
16186 Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
16187 Fix permission bits on sources checked out with an overtight umask
16188 checkout: do not lose staged removal
16189 diff/diff-files: do not use --cc too aggressively
16190 Start draft release notes for 1.6.0.3
16191 diff: use extended regexp to find hunk headers
16192 diff hunk pattern: fix misconverted "\{" tex macro introducers
16193 Update draft release notes to 1.6.0.3
16194 diff(1): clarify what "T"ypechange status means
16195 Hopefully the final draft release notes update before 1.6.0.3
16196 Fix testcase failure when extended attributes are in use
16199 Linus Torvalds (1):
16200 fix bogus "diff --git" header from "diff --no-index"
16203 git-svn: call 'fatal' correctly in set-tree
16205 Matt McCutchen (1):
16206 t1301-shared-repo.sh: don't let a default ACL interfere with the test
16208 Michael J Gruber (1):
16209 make "git remote" report multiple URLs
16211 Michael Prokop (1):
16212 Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
16214 Mikael Magnusson (4):
16215 Typo "bogos" in format-patch error message.
16216 git-repack uses --no-repack-object, not --no-repack-delta.
16217 Fix a few typos in relnotes
16218 Typo "does not exists" when git remote update remote.
16221 test-lib: fix color reset in say_color()
16222 Add testcase to ensure merging an early part of a branch is done properly
16224 Nanako Shiraishi (2):
16225 docs: describe pre-rebase hook
16226 Teach rebase -i to honor pre-rebase hook
16229 fix pread()'s short read in index-pack
16230 rehabilitate 'git index-pack' inside the object store
16233 Do not perform cross-directory renames when creating packs
16236 git-submodule: Fix "Unable to checkout" for the initial 'update'
16238 Rafael Garcia-Suarez (1):
16239 Clarify commit error message for unmerged files
16242 t0024: add executable permission
16243 Documentation: remove '\' in front of short options
16244 rebase -i: proper prepare-commit-msg hook argument when squashing
16245 rebase -i: remove leftover debugging
16246 bash: remove fetch, push, pull dashed form leftovers
16248 Samuel Tardieu (1):
16249 Do not use errno when pread() returns 0
16251 Shawn O. Pearce (3):
16252 Update release notes for 1.6.0.3
16253 Update release notes for 1.6.0.3
16254 test-lib: fix broken printf
16256 Stephen Haberman (1):
16257 Clarify how the user can satisfy stash's 'dirty state' check.
16260 sha1_file: link() returns -1 on failure, not errno
16262 Todd Zullinger (1):
16263 Use dashless git commands in setgitperms.perl
16266 Fix fetch/clone --quiet when stdout is connected
16269 Bust the ghost of long-defunct diffcore-pathspec.
16271 martin f. krafft (1):
16272 Improve git-log documentation wrt file filters
16275 Version v1.6.0.2; changes since v1.6.0.1:
16276 -----------------------------------------
16279 Fix use of hardlinks in "make install"
16281 Alexander Gavrilov (1):
16282 git-gui: Fix string escaping in po2msg.sh
16284 Alexandre Bourget (2):
16285 git-gui: Update french translation
16286 git-gui: update all remaining translations to French.
16288 Andreas Färber (1):
16289 Makefile: always provide a fallback when hardlinks fail
16291 Arjen Laarhoven (1):
16292 Use compatibility regex library for OSX/Darwin
16294 Ask Bjørn Hansen (1):
16295 Document sendemail.envelopesender configuration
16297 Björn Steinbrink (1):
16298 for-each-ref: Allow a trailing slash in the patterns
16300 Clemens Buchacher (2):
16301 git gui: show diffs with a minimum of 1 context line
16302 clone: fix creation of explicitly named target directory
16304 Gustaf Hendeby (1):
16305 Document clarification: gitmodules, gitattributes
16308 Start conforming code to "git subcmd" style
16309 Improve documentation for --dirstat diff option
16310 Start conforming code to "git subcmd" style part 2
16313 Fix "git log -i --grep"
16314 pretty=format: respect date format options
16315 checkout: fix message when leaving detached HEAD
16316 Use compatibility regex library also on FreeBSD
16319 Bring local clone's origin URL in line with that of a remote clone
16322 Use compatibility regex library also on AIX
16325 Fix passwd(5) ref and reflect that commit doens't use commit-tree
16327 Junio C Hamano (17):
16328 ctype.c: protect tiny C preprocessor constants
16329 shell: do not play duplicated definition games to shrink the executable
16330 Fix example in git-name-rev documentation
16331 git-apply: Loosen "match_beginning" logic
16332 checkout: do not check out unmerged higher stages randomly
16333 gitattributes: -crlf is not binary
16334 diff: Help "less" hide ^M from the output
16335 'git foo' program identifies itself without dash in die() messages
16336 Start 1.6.0.2 maintenance cycle
16337 diff --cumulative is a sub-option of --dirstat
16338 log --author/--committer: really match only with name part
16339 "blame -c" should be compatible with "annotate"
16340 Mention the fact that 'git annotate' is only for backward compatibility.
16341 stash: refresh the index before deciding if the work tree is dirty
16342 Update draft release notes for 1.6.0.2
16343 Update draft release notes for 1.6.0.2
16346 Linus Torvalds (2):
16347 index-pack: be careful after fixing up the header/footer
16348 Fix '--dirstat' with cross-directory renaming
16351 Git.pm: Use File::Temp->tempfile instead of ->new
16352 git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
16355 Makefile: add merge_recursive.h to LIB_H
16356 t7501: always use test_cmp instead of diff
16358 Nanako Shiraishi (4):
16359 tests: use "git xyzzy" form (t0000 - t3599)
16360 tests: use "git xyzzy" form (t3600 - t6999)
16361 tests: use "git xyzzy" form (t7000 - t7199)
16362 tests: use "git xyzzy" form (t7200 - t9001)
16364 Nguyễn Thái Ngọc Duy (6):
16365 index-pack: setup git repository
16366 diff*: fix worktree setup
16367 grep: fix worktree setup
16368 read-tree: setup worktree if merge is required
16369 update-index: fix worktree setup
16370 setup_git_directory(): fix move to worktree toplevel directory
16373 discard revindex data when pack list changes
16374 pack-objects: improve returned information from write_one()
16375 improve reliability of fixup_pack_header_footer()
16376 pack-objects: use fixup_pack_header_footer()'s validation mode
16377 index-pack: use fixup_pack_header_footer()'s validation mode
16378 fixup_pack_header_footer(): use nicely aligned buffer sizes
16379 improve handling of sideband message display
16382 make git-shell paranoid about closed stdin/stdout/stderr
16384 Paolo Ciarrocchi (1):
16385 tutorial: gentler illustration of Alice/Bob workflow using gitk
16388 bash completion: Hide more plumbing commands
16390 Ralf Wildenhues (1):
16391 Fix some manual typos.
16393 Ramsay Allan Jones (2):
16394 Fix a warning (on cygwin) to allow -Werror
16395 Suppress some bash redirection error messages
16398 Documentation: fix reference to a for-each-ref option
16399 Documentation: fix disappeared lines in 'git stash' manpage
16400 Documentation: minor cleanup in a use case in 'git stash' manual
16402 Shawn O. Pearce (2):
16403 pack-objects: Allow missing base objects when creating thin packs
16404 git-gui: Fix diff parsing for lines starting with "--" or "++"
16407 config.txt: Add missing colons after option name
16410 Document gitk --argscmd flag.
16413 Version v1.6.0.1; changes since v1.6.0:
16414 ---------------------------------------
16416 Alexander Gavrilov (1):
16417 Respect core.autocrlf in combined diff
16420 t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
16421 revision.h: make show_early_output an extern which is defined in revision.c
16422 compat/snprintf.c: handle snprintf's that always return the # chars transmitted
16425 mailinfo: re-fix MIME multipart boundary parsing
16428 Completion: add missing '=' for 'diff --diff-filter'
16431 git-svn: fix dcommit to urls with embedded usernames
16434 mailinfo: avoid violating strbuf assertion
16435 decorate: allow const objects to be decorated
16438 git format-patch: avoid underrun when format.headers is empty or all NLs
16439 remote.c: remove useless if-before-free test
16442 Install templates with the user and group of the installing personality
16444 Jonathan Nieder (2):
16445 Documentation: clarify pager.<cmd> configuration
16446 Documentation: clarify pager configuration
16448 Junio C Hamano (9):
16449 Start 1.6.0.X maintenance series
16450 diff --check: do not get confused by new blank lines in the middle
16451 for-each-ref: cope with tags with incomplete lines
16452 completion: find out supported merge strategies correctly
16453 "git-merge": allow fast-forwarding in a stat-dirty tree
16454 Update draft release notes for 1.6.0.1
16455 unpack_trees(): protect the handcrafted in-core index from read_cache()
16456 merge: fix numerus bugs around "trivial merge" area
16460 Fix 'git help help'
16461 Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
16463 Robert Schiele (1):
16464 adapt git-cvsserver manpage to dash-free syntax
16466 Simon Hausmann (1):
16467 Clean up the git-p4 documentation
16469 Tarmigan Casebolt (1):
16470 Add hints to revert documentation about other ways to undo changes
16472 Tor Arvid Lund (1):
16473 git-p4: Fix one-liner in p4_write_pipe function.
16476 Version v1.6.0; changes since v1.6.0-rc3:
16477 -----------------------------------------
16480 Fix t3700 on filesystems which do not support question marks in names
16482 Alexander Gavrilov (1):
16483 gitk: Allow safely calling nukefile from a run queue handler
16486 Create a specific version of the read_pipe_lines command for p4 invocations
16487 Utilise the new 'p4_read_pipe_lines' command
16488 Have a command that specifically invokes 'p4' (via system)
16489 Utilise the new 'p4_system' function.
16490 Add a single command that will be used to construct the 'p4' command
16491 If we are in verbose mode, output what we are about to run (or return)
16492 Switch to using 'p4_build_cmd'
16493 If the user has configured various parameters, use them.
16494 Consistently use 'git-p4' for the configuration entries
16495 Move git-p4.syncFromOrigin into a configuration parameters section
16496 Put some documentation in about the parameters that have been added
16497 Put in the two other configuration elements found in the source
16498 Add p4 read_pipe and write_pipe wrappers
16499 Utilise our new p4_read_pipe and p4_write_pipe wrappers
16502 test-parse-options: use appropriate cast in length_callback
16503 t5304-prune: adjust file mtime based on system time rather than file mtime
16506 Makefile: building git in cygwin 1.7.0
16509 bash completion: 'git apply' should use 'fix' not 'strip'
16511 Junio C Hamano (1):
16515 Fix escaping of glob special characters in pathspecs
16518 bash completion: Add completion for 'git mergetool'
16519 bash completion: Add '--merge' long option for 'git log'
16522 bash-completion: Add non-command git help files to bash-completion
16523 Git.pm: Make File::Spec and File::Temp requirement lazy
16525 Matt McCutchen (1):
16526 git format-patch documentation: clarify what --cover-letter does
16529 Documentation: document the pager.* configuration setting
16530 t9300: replace '!' with test_must_fail
16533 git-p4: chdir now properly sets PWD environment variable in msysGit
16535 Shawn O. Pearce (1):
16539 git-am: ignore --binary option
16540 git-stash: improve synopsis in help and manual page
16541 Improve error output of git-rebase
16544 rebase -i -p: handle index and workdir correctly
16545 rebase -i -p: fix parent rewriting
16548 Version v1.6.0-rc3; changes since v1.6.0-rc2:
16549 ---------------------------------------------
16552 Makefile: set SHELL to value of SHELL_PATH
16553 Makefile: add a target which will abort compilation with ancient shells
16556 git-svn: add ability to specify --commit-url for dcommit
16557 git-svn: wrap long lines in a few places
16559 Francis Moreau (1):
16560 git-bisect: fix wrong usage of read(1)
16562 Gustaf Hendeby (2):
16563 gitattributes: Document built in hunk header patterns
16564 Teach git diff about BibTeX head hunk patterns
16566 Ivan Stankovic (1):
16567 Documentation: fix invalid reference to 'mybranch' in user manual
16569 Johannes Schindelin (1):
16570 clone --mirror: avoid storing repeated tags
16572 Jonathan Nieder (1):
16573 Documentation: user-manual: "git commit -a" doesn't motivate .gitignore
16575 Junio C Hamano (9):
16576 asciidoc markup fixes
16577 GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
16578 mailinfo: fix MIME multi-part message boundary handling
16579 Update draft RelNotes for 1.6.0
16580 Fix deleting reflog entries from HEAD reflog
16581 Re-fix rev-list-options documentation
16582 diff --check: do not unconditionally complain about trailing empty lines
16583 Do not talk about "diff" in rev-list documentation.
16587 Fix multi-glob assertion in git-svn
16588 git-svn: Allow deep branch names by supporting multi-globs
16589 Git.pm: Add faculties to allow temp files to be cached
16590 git-svn: Make it incrementally faster by minimizing temp files
16591 git-svn: Reduce temp file usage when dealing with non-links
16593 Nguyễn Thái Ngọc Duy (1):
16594 Fix typo in comments of longest_ancestor_length()
16597 Fail properly when cloning from invalid HTTP URL
16598 Adjust for the new way of enabling the default post-update hook
16601 builtin-rm: Add a --force flag
16602 reflog test: add more tests for 'reflog delete'
16605 bash: remove redundant check for 'git stash apply' options
16607 Stephen R. van den Berg (1):
16608 git-daemon: SysV needs the signal handler reinstated.
16611 Documentation: commit-tree: remove 16 parents restriction
16612 Documentation: filter-branch: document how to filter all refs
16613 filter-branch: be more helpful when an annotated tag changes
16614 Documentation: rev-list-options: Fix -g paragraph formatting
16615 Documentation: rev-list-options: Fix a typo
16616 Documentation: rev-list-options: Rewrite simplification descriptions for clarity
16619 Version v1.6.0-rc2; changes since v1.6.0-rc1:
16620 ---------------------------------------------
16622 Abhijit Menon-Sen (7):
16623 `git submodule add` now requires a <path>
16624 Make it clear that push can take multiple refspecs
16625 Make the DESCRIPTION match <x>... items in the SYNOPSIS
16626 Git.pm: localise $? in command_close_bidi_pipe()
16627 Fix hash slice syntax error
16628 Fix typo in perl/Git.pm
16629 Fix typos in INSTALL
16632 Make use of stat.ctime configurable
16634 Alexander Gavrilov (9):
16635 git-gui: Fix the Remote menu separator.
16636 git-gui: Preserve scroll position on reshow_diff.
16637 Support copy and rename detection in fast-export.
16638 gitk: Kill back-end processes on window close
16639 gitk: Arrange to kill diff-files & diff-index on quit
16640 gitk: On Windows, use a Cygwin-specific flag for kill
16641 gitk: Fixed broken exception handling in diff
16642 gitk: Fixed automatic row selection during load
16643 gitk: Fallback to selecting the head commit upon load
16645 Anders Melchiorsen (4):
16646 Advertise the ability to abort a commit
16647 Documentation: fix diff.external example
16648 Flush output in start_async
16649 Add output flushing before fork()
16651 Avery Pennarun (2):
16652 Teach "git diff -p" Pascal/Delphi funcname pattern
16653 git-svn: Abort with an error if 'fetch' parameter is invalid.
16656 t/t4202-log.sh: add newline at end of file
16657 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
16658 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section
16660 Brian Gernhardt (1):
16661 Documentation: Remove mentions of git-svnimport.
16663 Cesar Eduardo Barros (1):
16664 Documentation/git-rev-parse.txt: update for new git-describe output format
16666 Christian Couder (2):
16667 merge-base: die with an error message if not passed a commit ref
16668 documentation: user-manual: update "using-bisect" section
16670 Christian Stimming (2):
16671 git-gui: Update German translation
16672 gitk: Updated German translation
16674 Ciaran McCreesh (1):
16675 Make git-add -i accept ranges like 7-
16677 David D. Kilzer (1):
16678 Fix race condition in t9119-git-svn-info.sh
16680 Dmitry Potapov (1):
16681 correct access right for git-svn-dcommit test
16684 git-svn: properly set path for "info" command
16685 t9119: conditionally re-enable test depending on svn(1) version
16687 Giuseppe Bilotta (2):
16688 diff: add ruby funcname pattern
16689 diff: chapter and part in funcname for tex
16692 init: handle empty "template" parameter
16693 Compact commit template message
16694 init: handle empty "template" parameter
16697 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
16699 Johannes Schindelin (3):
16700 sort_in_topological_order(): avoid setting a commit flag
16701 clone: Add an option to set up a mirror
16702 clone --bare: Add ".git" suffix to the directory name to clone into
16705 git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
16708 Fix reference to Everyday Git, which is an HTML document and not a man page.
16710 Jonathan Nieder (1):
16711 git-diff(1): "--c" -> "--cc" typo fix
16713 Junio C Hamano (19):
16714 Allow building without any git installed
16715 Allow installing in the traditional way
16716 ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
16717 Documentation: clarify what is shown in "git-ls-files -s" output
16718 t7001: fix "git mv" test
16719 Teach gitlinks to ie_modified() and ce_modified_check_fs()
16720 Fix merge name generation in "merge in C"
16721 Fix test-parse-options "integer" test
16722 Teach --find-copies-harder to "git blame"
16723 make sure parsed wildcard refspec ends with slash
16724 Documentation: clarify diff --cc
16725 Update my e-mail address
16726 Start 1.5.6.5 RelNotes to describe accumulated fixes
16727 builtin-name-rev.c: split deeply nested part from the main function
16728 RelNotes 1.5.6.5 updates
16729 fix diff-tree --stdin documentation
16730 Files given on the command line are relative to $cwd
16735 format-patch: Produce better output with --inline or --attach
16738 bash completion: remove unused function _git_diff_tree
16739 bash completion: Add more long options for 'git log'
16740 bash completion: Add completion for 'git grep'
16741 bash completion: Add completion for 'git clone'
16742 bash completion: Add completion for 'git clean'
16743 bash completion: Add completion for 'git init'
16744 bash completion: Add completion for 'git revert'
16745 bash completion: More completions for 'git stash'
16746 bash completion: Add completion for 'git archive'
16747 bash completion: Add completion for 'git ls-files'
16748 bash completion: Add completion for 'git mv'
16750 Linus Torvalds (1):
16751 diff.renamelimit is a basic diff configuration
16753 Michele Ballabio (2):
16754 git-gui: update po/it.po
16755 git-gui: add a part about format strings in po/README
16757 Mikael Magnusson (2):
16758 git-gui: Update swedish translation.
16759 gitk: Update swedish translation.
16762 Documentation: typos / spelling fixes in older RelNotes
16763 Documentation: typos / spelling fixes
16765 Nanako Shiraishi (1):
16766 git-gui: update Japanese translation
16769 builtin-verify-tag: fix -v option parsing
16771 Pierre Habouzit (2):
16772 Allow "non-option" revision options in parse_option-enabled commands
16773 git-submodule: move ill placed shift.
16776 git-name-rev: allow --name-only in combination with --stdin
16779 archive: allow --exec and --remote without equal sign
16780 git-name-rev: don't use printf without format
16782 Shawn O. Pearce (2):
16783 git-gui: Fix gitk search in $PATH to work on Windows
16784 git-gui: Update git-gui.pot for 0.11 nearing release
16786 Steffen Prohaska (6):
16787 Refactor, adding prepare_git_cmd(const char **argv)
16788 run-command (Windows): Run dashless "git <cmd>"
16789 git-gui: Correct installation of library to be $prefix/share
16790 git-gui (Windows): Switch to relative discovery of oguilib
16791 git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
16792 Modify mingw_main() workaround to avoid link errors
16795 builtin-revert.c: typofix
16798 Propagate -u/--upload-pack option of "git clone" to transport.
16801 Optimize sha1_object_info for loose objects, not concurrent repacks
16803 Todd Zullinger (1):
16804 Replace uses of "git-var" with "git var"
16807 Version v1.6.0-rc1; changes since v1.6.0-rc0:
16808 ---------------------------------------------
16810 Abhijit Menon-Sen (2):
16811 git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
16812 Clarify that "git log x.c y.h" lists commits that touch either file
16815 Allow pager of diff command be enabled/disabled
16817 Alexander Gavrilov (4):
16818 Fix pre-commit hooks under MinGW/MSYS
16819 Add options to control the search for copies in blame.
16820 Kill the blame back-end on window close.
16821 Add a menu item to invoke full copy detection in blame.
16823 Anders Melchiorsen (1):
16824 Documentation: fix diff.external example
16826 Björn Steinbrink (2):
16827 index-pack.c: correctly initialize appended objects
16828 rev-parse: Add support for the ^! and ^@ syntax
16831 git-svn: teach dcommit about svn auto-props
16834 t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
16835 t4116-apply-reverse.sh: use $TAR rather than tar
16836 t3200,t7201: replace '!' with test_must_fail
16837 t7502-commit.sh: rearrange test to make more portable
16838 t/t4202-log.sh: add newline at end of file
16839 Teach fsck and prune about the new location of temporary objects
16840 perl/Makefile: update NO_PERL_MAKEMAKER section
16842 Cesar Eduardo Barros (1):
16843 Documentation/git-submodule.txt: fix doubled word
16845 Daniel Barkalow (1):
16846 In perforce, RCS keywords are case-sensitive
16848 Jakub Narebski (1):
16849 gitweb: More about how gitweb gets 'owner' of repository
16851 Johannes Schindelin (9):
16852 Rename .git/rebase to .git/rebase-apply
16853 Rename path_list to string_list
16854 Fix two leftovers from path_list->string_list
16855 Ignore dirty submodule states in "git pull --rebase"
16856 Add test to show that show-branch misses out the 8th column
16857 sort_in_topological_order(): avoid setting a commit flag
16858 builtin-commit: Two trivial style-cleanups
16859 git daemon: avoid waking up too often
16860 Avoid chdir() in list_commands_in_dir()
16862 Johannes Sixt (12):
16863 rebase -i: When an 'edit' stops, mention the commit
16864 Makefile: Do not install a copy of 'git' in $(gitexecdir)
16865 Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
16866 Record the command invocation path early
16867 Fix relative built-in paths to be relative to the command invocation
16868 Allow the built-in exec path to be relative to the command invocation path
16869 Allow add_path() to add non-existent directories to the path
16870 Windows: Make $(gitexecdir) relative
16871 Windows: Make sure argv[0] has a path
16872 Windows: Do not compile git-shell
16873 git-gui: Fix "Stage/Unstage Line" with one line of context.
16874 git-gui: "Stage Line": Treat independent changes in adjacent lines better
16876 Jonathan Nieder (3):
16877 git-diff(1): "--c" -> "--cc" typo fix
16878 document that git-tag can tag more than heads
16879 t6030 (bisect): work around Mac OS X "ls"
16881 Junio C Hamano (13):
16882 Update my e-mail address
16883 Revert "make git-status use a pager"
16884 tests: do not rely on external "patch"
16885 stash save: fix parameter handling
16886 builtin-branch.c: remove unused code in append_ref() callback function
16887 builtin-branch.c: optimize --merged and --no-merged
16888 Documentation: clarify diff --cc
16889 ignore non-existent refs in dwim_log()
16890 tests: propagate $(TAR) down from the toplevel Makefile
16891 Makefile: fix shell quoting
16892 Documentation: clarify how to disable elements in core.whitespace
16893 make sure parsed wildcard refspec ends with slash
16897 builtin-branch: remove duplicated code
16898 builtin-branch: factor out merge_filter matching
16899 builtin-branch: fix -v for --[no-]merged
16902 bash completion: Add long options for 'git rm'
16903 bash completion: Add completion for 'git help'
16906 builtin-merge: give a proper error message for invalid strategies in config
16907 t7601: extend the 'merge picks up the best result' test
16909 Nikolaj Schumacher (1):
16910 Don't cut off last character of commit descriptions.
16913 git-am: remove dash from help message
16914 parse-options: fix segmentation fault when a required value is missing
16915 git am --skip: clean the index while preserving local changes
16916 update test case to protect am --skip behaviour
16919 svnimport: newer libsvn wants us to ask for the root with "", not "/"
16921 Peter Valdemar Mørch (1):
16922 send-email: find body-encoding correctly
16925 git-filter-branch.sh: Allow running in bare repositories
16926 Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"
16927 git-mv: Remove dead code branch
16928 git-mv: Keep moved index entries inact
16930 Philippe Bruhat (1):
16931 mailinfo: better parse email adresses containg parentheses
16933 Pierre Habouzit (4):
16934 builtin-merge: add missing structure initialization
16935 git-submodule: move ill placed shift.
16936 git-checkout: fix command line parsing.
16937 git-checkout: improve error messages, detect ambiguities.
16940 archive: add write_archive()
16941 archive: move parameter parsing code to archive.c
16942 archive: define MAX_ARGS where it's needed
16943 archive: declare struct archiver where it's needed
16944 archive: allow --exec and --remote without equal sign
16947 checkout: mention '--' in the docs
16948 bash: offer only paths after '--' for 'git checkout'
16950 Shawn O. Pearce (2):
16951 git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
16952 fsck: Don't require tmp_obj_ file names are 14 bytes in length
16955 git-am: Add colon before the subject that is printed out as being applied
16956 am --abort: Add to bash-completion and mention in git-rerere documentation
16957 Make non-static functions, that may be static, static
16958 Move launch_editor() from builtin-tag.c to editor.c
16959 editor.c: Libify launch_editor()
16960 git-am: Mention --abort in usage string part of OPTIONS_SPEC
16961 git-reset: Let -q hush "locally modified" messages
16964 Propagate -u/--upload-pack option of "git clone" to transport.
16965 Remove references to git-fetch-pack from "git clone" documentation.
16968 git-completion.bash: provide completion for 'show-branch'
16969 bash completion: Add long options for 'git describe'
16972 Version v1.6.0-rc0; changes since v1.5.6.6:
16973 -------------------------------------------
16975 Abhijit Menon-Sen (4):
16976 git-gui: Move on to the next filename after staging/unstaging a change
16977 git-gui: Don't select the wrong file if the last listed file is staged.
16978 Implement "git stash branch <newbranch> <stash>"
16979 Add a test for "git stash branch"
16982 Move read_revisions_from_stdin from builtin-rev-list.c to revision.c
16983 Teach git-bundle to read revision arguments from stdin like git-rev-list.
16986 Fix use of "perl -i" on Windows
16988 Alexander Gavrilov (3):
16989 Avoid rescanning unchanged entries in search for copies.
16990 Do not try to detect move/copy for entries below threshold.
16991 Support gitlinks in fast-import.
16993 Avery Pennarun (1):
16994 Reword "your branch has diverged..." lines to reduce line length
16997 t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
16999 Brian Gernhardt (4):
17000 Fix t4017-diff-retval for white-space from wc
17001 Add test results directory to t/.gitignore
17002 Documentation: Point to gitcli(7) from git(1)
17003 Documentation: mention ORIG_HEAD in am, merge, and rebase
17005 Christian Couder (2):
17006 help: check early if we have a command, if not try a documentation topic
17007 Fix "config_error_nonbool" used with value instead of key
17009 Ciaran McCreesh (1):
17010 Make git-add -i accept ranges like 7-
17012 Cristian Peraferrer (1):
17013 Print errno upon failure to open the COMMIT_EDITMSG file
17015 Daniel Barkalow (1):
17016 Only use GIT_CONFIG in "git config", not other programs
17019 Implement normalize_absolute_path
17020 Fold test-absolute-path into test-path-utils
17021 Add support for GIT_CEILING_DIRECTORIES
17022 Eliminate an unnecessary chdir("..")
17024 Dmitry Kakurin (1):
17025 Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
17027 Dmitry Potapov (4):
17028 update-hook-example: optionally allow non-fast-forward
17029 shrink git-shell by avoiding redundant dependencies
17030 completion.bash: add 'skip' and 'run' to git-bisect
17031 git-svn: fix git svn info to work without arguments
17034 git-apply: handle a patch that touches the same path more than once better
17037 user-manual: typo and grammar fixes
17038 Documentation: fix broken "linkgit" links
17041 Documentation: tweak use case in "git stash save --keep-index"
17042 completion: add branch options --contains --merged --no-merged
17043 Teach lookup_prog not to select directories
17046 t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
17049 Testsuite: Unset CVS_SERVER
17050 testsuite for cvs co -c
17052 Frederik Schwarzer (1):
17056 tutorial: use prompt with user names in example, to clarify who is doing what
17058 Jakub Narebski (4):
17059 gitweb: Separate filling list of projects info
17060 gitweb: Separate generating 'sort by' table header
17061 t/README: Add 'Skipping Tests' section below 'Running Tests'
17062 gitweb: Describe projects_index format in more detail
17065 fix whitespace violations in test scripts
17066 mask necessary whitespace policy violations in test scripts
17067 avoid whitespace on empty line in automatic usage message
17068 avoid trailing whitespace in zero-change diffstat lines
17069 enable whitespace checking of test scripts
17070 clone: create intermediate directories of destination repo
17071 improve for-each-ref test script
17072 Allow per-command pager config
17073 avoid null SHA1 in oldest reflog
17076 Add 'git-p4.allowSubmit' to git-p4
17079 Incorporate fetched packs in future object traversal
17080 Move pack_refs() and friends into libgit
17081 Prepare testsuite for a "git clone" that packs refs
17082 Teach "git clone" to pack refs
17084 Johannes Schindelin (12):
17085 Windows: always chmod(, 0666) before unlink().
17086 commit-tree: lift completely arbitrary limit of 16 parents
17087 Allow git-apply to recount the lines in a hunk (AKA recountdiff)
17088 Add another fast-import example, this time for .zip files
17089 Teach "git apply" to prepend a prefix with "--root=<root>"
17090 git fetch-pack: do not complain about "no common commits" in an empty repo
17091 Allow cherry-picking root commits
17092 Convert CR/LF to LF in tag signatures
17093 Move MERGE_RR from .git/rr-cache/ into .git/
17094 git-gui: MERGE_RR lives in .git/ directly with newer Git versions
17095 shortlog: support --pretty=format: option
17096 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
17098 Johannes Sixt (38):
17099 Add compat/regex.[ch] and compat/fnmatch.[ch].
17100 Compile some programs only conditionally.
17101 Add target architecture MinGW.
17102 Windows: Use the Windows style PATH separator ';'.
17103 setup.c: Prepare for Windows directory separators.
17104 Windows: Treat Windows style path names.
17105 Windows: Handle absolute paths in safe_create_leading_directories().
17106 Windows: Strip ".exe" from the program name.
17107 Windows: Implement a wrapper of the open() function.
17108 Windows: A minimal implemention of getpwuid().
17109 Windows: Work around misbehaved rename().
17110 Make my_mktime() public and rename it to tm_to_time_t()
17111 Windows: Implement gettimeofday().
17112 Windows: Fix PRIuMAX definition.
17113 Windows: Implement setitimer() and sigaction().
17114 Windows: Wrap execve so that shell scripts can be invoked.
17115 Windows: A pipe() replacement whose ends are not inherited to children.
17116 Windows: Implement start_command().
17117 Windows: A rudimentary poll() emulation.
17118 Windows: Disambiguate DOS style paths from SSH URLs.
17119 Windows: Implement asynchronous functions as threads.
17120 Windows: Work around incompatible sort and find.
17121 Windows: Implement wrappers for gethostbyname(), socket(), and connect().
17122 Windows: Implement a custom spawnve().
17123 Windows: Add a custom implementation for utime().
17124 Windows: Use a customized struct stat that also has the st_blocks member.
17125 Turn builtin_exec_path into a function.
17126 Windows: Compute the fallback for exec_path from the program invocation.
17127 Windows: Use a relative default template_dir and ETC_GITCONFIG
17128 When installing, be prepared that template_dir may be relative.
17129 Windows: Make the pager work.
17130 Windows: Work around an oddity when a pipe with no reader is written to.
17131 Windows: Make 'git help -a' work.
17132 Windows: TMP and TEMP environment variables specify a temporary directory.
17133 git-gui: Implement "Stage/Unstage Line"
17134 t4127-apply-same-fn: Avoid sed -i
17135 Provide fallback definitions of PRIu32 and PRIx32
17136 builtin-clone: rewrite guess_dir_name()
17138 Jonathan Nieder (23):
17139 Documentation: don't assume git-sh-setup and git-parse-remote are in PATH
17140 Documentation: fix links to tutorials and other new manual pages
17141 whitespace fix in Documentation/git-repack.txt
17142 Documentation: complicate example of "man git-command"
17143 git-daemon(1): don't assume git-daemon is in /usr/bin
17144 Documentation: prepare to be consistent about "git-" versus "git "
17145 Documentation: be consistent about "git-" versus "git "
17146 Documentation formatting and cleanup
17147 git-format-patch(1): fix stray \ in output
17148 Documentation: fix gitlinks
17149 manpages: fix bogus whitespace
17151 git-commit(1): depersonalize description
17152 Documentation: rewrap to prepare for "git-" vs "git " change
17153 Documentation: more "git-" versus "git " changes
17154 gitdiffcore(7): fix awkward wording
17155 manpages: italicize command names in synopses
17156 manpages: italicize command names
17157 manpages: italicize git command names (which were in teletype font)
17158 manpages: italicize gitk's name (where it was in teletype font)
17159 manpages: italicize nongit command names (if they are in teletype font)
17160 manpages: italicize git subcommand names (which were in teletype font)
17161 manpages: use teletype font for sample command lines
17164 git-svn: find-rev and rebase for SVN::Mirror repositories
17166 Junio C Hamano (65):
17167 revision traversal: --children option
17168 rev-list --children
17169 builtin-blame.c: move prepare_final() into a separate function.
17170 builtin-blame.c: allow more than 16 parents
17171 git-blame --reverse
17172 rerere: rerere_created_at() and has_resolution() abstraction
17173 git-rerere: detect unparsable conflicts
17174 rerere: remove dubious "tail_optimization"
17175 t4200: fix rerere test
17177 git-shell: accept "git foo" form
17178 Prepare execv_git_cmd() for removal of builtins from the filesystem
17179 pre-rebase hook update
17180 Ship sample hooks with .sample suffix
17181 Keep some git-* programs in $(bindir)
17182 Start draft release notes for 1.6.0
17183 diff --check: explain why we do not care whether old side is binary
17184 check_and_emit_line(): rename and refactor
17185 checkdiff: pass diff_options to the callback
17186 Teach "diff --check" about new blank lines at end
17187 diff --check: detect leftover conflict markers
17188 Update sample pre-commit hook to use "diff --check"
17189 Document the double-dash "rev -- path" disambiguator
17190 t9700: skip when Test::More is not available
17191 Update draft release notes for 1.6.0
17192 Introduce get_merge_bases_many()
17193 Introduce reduce_heads()
17194 Update draft release notes for 1.6.0
17195 apply --root: thinkofix.
17196 Refactor "tracking statistics" code used by "git checkout"
17197 git-status: show the remote tracking statistics
17198 git-branch -v: show the remote tracking statistics
17199 fast-export --export-marks: fix off by one error
17200 stat_tracking_info(): clear object flags used during counting
17201 branch -r -v: do not spit out garbage
17202 git-apply --directory: make --root more similar to GNU diff
17203 Update draft release notes for 1.6.0
17204 Teach "am" and "rebase" to mark the original position with ORIG_HEAD
17205 Tone down warning about GNU Interactive Tools
17206 Documentation: update sections on naming revisions and revision ranges
17207 branch --contains: default to HEAD
17208 branch --merged/--no-merged: allow specifying arbitrary commit
17209 apply: fix copy/rename breakage
17210 Teach merge.log to "git-merge" again
17211 Update draft release notes for 1.6.0
17212 reduce_heads(): protect from duplicate input
17213 git-rebase: report checkout failure
17214 tutorial: clarify "pull" is "fetch + merge"
17215 Update draft release notes to 1.6.0
17216 t/aggregate-results: whitespace fix
17217 Update draft release notes for 1.6.0
17218 read-cache.c: typofix
17219 mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
17220 rerere.autoupdate: change the message when autoupdate is in effect
17221 builtin-remote.c: fix earlier "skip_prefix()" conversion
17222 t9001 (send-email): Do not use hardcoded /bin/sh in test
17224 Getting closer to 1.6.0-rc0
17225 builtin-add.c: restructure the code for maintainability
17226 git-add --all: add all files
17227 git-add --all: tests
17228 git-add --all: documentation
17229 Link shell with compat layer functions
17230 Move read_in_full() and write_in_full() to wrapper.c
17231 "needs update" considered harmful
17233 Karl Hasselström (2):
17234 Clean up builtin-update-ref's option parsing
17235 Make old sha1 optional with git update-ref -d
17238 git-send-email: Accept fifos as well as files
17240 Lars Noschinski (3):
17241 cvsserver: Add support for packed refs
17242 cvsserver: Add cvs co -c support
17243 cvsserver: Add testsuite for packed refs
17246 test-lib.sh: add --long-tests option
17247 t/test-lib.sh: add test_external and test_external_without_stderr
17248 Git.pm: add test suite
17249 gitweb: standarize HTTP status codes
17250 test-lib.sh: show git init output when in verbose mode
17251 GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
17253 Linus Torvalds (1):
17254 Shrink the git binary a bit by avoiding unnecessary inline functions
17256 Lukas Sandström (4):
17257 Add a helper script to send patches with Mozilla Thunderbird
17258 Make some strbuf_*() struct strbuf arguments const.
17259 Add some useful functions for strbuf manipulation.
17260 git-mailinfo: use strbuf's instead of fixed buffers
17262 Marius Storm-Olsen (4):
17263 Add an optional <mode> argument to commit/status -u|--untracked-files option
17264 Add argument 'no' commit/status option -u|--untracked-files
17265 Add configuration option for default untracked files mode
17266 Windows: Add a new lstat and fstat implementation based on Win32 API.
17269 install-doc-quick - use git --exec-path to find git-sh-setup
17270 git-submodule - make "submodule add" more strict, and document it
17271 git-submodule - register submodule URL if adding in place
17273 Michele Ballabio (3):
17274 t9301-fast-export.sh: Remove debug line
17275 builtin-merge.c: Fix option parsing
17276 builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
17279 Catch failures from t5540-http-push
17281 Skip t5540-http-push test when USE_CURL_MULTI is undefined
17282 Avoid apache complaining about lack of server's FQDN
17285 We need to check for msys as well as Windows in add--interactive.
17288 A simple script to parse the results from the testcases
17289 Move split_cmdline() to alias.c
17290 Move commit_list_count() to commit.c
17291 Move parse-options's skip_prefix() to git-compat-util.h
17292 Add new test to ensure git-merge handles pull.twohead and pull.octopus
17293 Move read_cache_unmerged() to read-cache.c
17294 git-fmt-merge-msg: make it usable from other builtins
17295 Introduce get_octopus_merge_bases() in commit.c
17296 Add new test to ensure git-merge handles more than 25 refs.
17297 Add new test case to ensure git-merge reduces octopus parents when possible
17298 Retire 'stupid' merge strategy
17299 INSTALL: Update section about git-frotz form.
17300 hg-to-git: avoid raising a string exception
17301 hg-to-git: abort if the project directory is not a hg repo
17302 hg-to-git: rewrite "git-frotz" to "git frotz"
17303 hg-to-git: use git init instead of git init-db
17304 Add new test case to ensure git-merge prepends the custom merge message
17305 git-commit-tree: make it usable from other builtins
17306 Fix t7601-merge-pull-config.sh on AIX
17308 t0001-init.sh: change confusing directory name
17309 t1007-hash-object.sh: use quotes for the test description
17310 git-bisect: use dash-less form on git bisect log
17311 make remove-dashes: apply to scripts and programs as well, not just to builtins
17312 t6021: add a new test for git-merge-resolve
17313 Add a new test for git-merge-resolve
17314 Teach 'git merge' that some merge strategies no longer exist
17316 Nanako Shiraishi (7):
17317 environment.c: remove unused function
17318 config.c: make git_env_bool() static
17319 gitcli: Document meaning of --cached and --index
17320 cache-tree.c: make cache_tree_find() static
17321 builtin-describe.c: make a global variable "pattern" static
17322 parse-options.c: make check_typos() static
17325 Nguyễn Thái Ngọc Duy (1):
17326 Move all dashed-form commands to libexecdir
17328 Nicolas Pitre (11):
17329 call init_pack_revindex() lazily
17330 implement some resilience against pack corruptions
17331 test case for pack resilience against corruptions
17332 refactor pack structure allocation
17333 optimize verify-pack a bit
17334 move show_pack_info() where it belongs
17335 verify-pack: check packed object CRC when using index version 2
17336 verify-pack: test for detection of index v2 object CRC mismatch
17337 repack.usedeltabaseoffset config option now defaults to "true"
17338 pack.indexversion config option now defaults to 2
17339 restore legacy behavior for read_sha1_file()
17342 Documentation: remove {show,whatchanged}.difftree config options
17343 show_stats(): fix stats width calculation
17344 builtin-rerere: more carefully find conflict markers
17346 Patrick Higgins (1):
17347 Remove the use of '--' in merge program invocation
17350 t9600: allow testing with cvsps 2.2, including beta versions
17353 Add ANSI control code emulation for the Windows console
17356 Git.pm: Add remote_refs() git-ls-remote frontend
17357 Documentation/git-submodule.txt: Add Description section
17358 Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
17359 Documentation/git-submodule.txt: Further clarify the description
17360 Documentation: How to ignore local changes in tracked files
17361 Documentation/git-merge.txt: Partial rewrite of How Merge Works
17363 Pierre Habouzit (13):
17364 parse-opt: have parse_options_{start,end}.
17365 parse-opt: Export a non NORETURN usage dumper.
17366 parse-opt: create parse_options_step.
17367 parse-opt: do not print errors on unknown options, return -2 intead.
17368 parse-opt: fake short strings for callers to believe in.
17369 parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
17370 revisions: split handle_revision_opt() from setup_revisions()
17371 git-blame: migrate to incremental parse-option [1/2]
17372 git-blame: migrate to incremental parse-option [2/2]
17373 parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
17374 git-blame: fix lapsus
17375 git-shortlog: migrate to parse-options partially.
17376 revisions: refactor handle_revision_opt into parse_revision_opt.
17379 builtin-fast-export: Add importing and exporting of revision marks
17381 Rafael Garcia-Suarez (1):
17382 gitweb: remove git_blame and rename git_blame2 to git_blame
17384 Ramsay Allan Jones (4):
17385 Fix some warnings (on cygwin) to allow -Werror
17386 t9113-*.sh: provide user feedback when test skipped
17387 t9100-git-svn-basic.sh: Fix determination of utf-8 locale
17388 git-request-pull: replace call to deprecated peek-remote
17391 Teach new attribute 'export-ignore' to git-archive
17392 archive: remove args member from struct archiver
17393 add context pointer to read_tree_recursive()
17394 archive: add baselen member to struct archiver_args
17395 archive: centralize archive entry writing
17396 archive: unify file attribute handling
17397 archive: remove extra arguments parsing code
17398 archive: make zip compression level independent from core git
17399 archive: remove unused headers
17402 git-gui: Fix accidental staged state toggle when clicking top pixel row
17404 Robert Shearman (1):
17405 git-send-email: Fix authenticating on some servers when using TLS.
17408 stash: introduce 'stash save --keep-index' option
17410 Shawn O. Pearce (2):
17411 Correct documentation for git-push --mirror
17412 bash completion: Remove dashed command completion support
17414 Soeren Finster (1):
17415 git-gui: Exit shortcut in MacOSX repaired
17417 Steffen Prohaska (5):
17418 Windows: Fix ntohl() related warnings about printf formatting
17419 compat/pread.c: Add a forward declaration to fix a warning
17420 Move code interpreting path relative to exec-dir to new function system_path()
17421 help.c: Add support for htmldir relative to git_exec_path()
17422 help (Windows): Display HTML in default browser using Windows' shell API
17424 Stephan Beyer (10):
17425 api-builtin.txt: update and fix typo
17426 t3404: stricter tests for git-rebase--interactive
17427 rerere: Separate libgit and builtin functions
17428 t/test-lib.sh: exit with small negagive int is ok with test_must_fail
17429 t/: Use "test_must_fail git" instead of "! git"
17430 Make usage strings dash-less
17431 git-am/git-mailsplit: correct synopsis for reading from stdin
17432 t3404: test two "preserve merges with -p" cases
17433 Make rebase--interactive use OPTIONS_SPEC
17434 Link git-shell only to a subset of libgit.a
17437 t/Makefile: use specified shell when running aggregation script
17439 Sverre Hvammen Johansen (1):
17440 reduce_heads(): thinkofix
17442 Sverre Rabbelier (2):
17443 Modify test-lib.sh to output stats to t/test-results/*
17444 Hook up the result aggregation in the test makefile.
17447 Don't use dash commands (git-foo) in tutorial-2
17450 bash: Add more option completions for 'git log'
17451 Add target "install-html" the the top level Makefile
17452 bash: Add long option completion for 'git send-email'
17455 git-send-email: add support for TLS via Net::SMTP::SSL
17456 git-send-email: prevent undefined variable warnings if no encryption is set
17457 git-add--interactive: replace hunk recounting with apply --recount
17458 git-add--interactive: remove hunk coalescing
17459 git-add--interactive: manual hunk editing mode
17460 git-send-email: Do not attempt to STARTTLS more than once
17461 Fix apply --recount handling of no-EOL line
17464 Version v1.5.6.6; changes since v1.5.6.5:
17465 -----------------------------------------
17467 Alexander Gavrilov (1):
17468 Fix quadratic performance in rewrite_one.
17471 t5304-prune: adjust file mtime based on system time rather than file mtime
17473 Francis Moreau (1):
17474 git-bisect: fix wrong usage of read(1)
17476 Ivan Stankovic (1):
17477 Documentation: fix invalid reference to 'mybranch' in user manual
17479 Junio C Hamano (8):
17480 Per-ref reflog expiry configuration
17481 Make default expiration period of reflog used for stash infinite
17482 asciidoc markup fixes
17483 Fix deleting reflog entries from HEAD reflog
17484 Re-fix rev-list-options documentation
17485 Do not talk about "diff" in rev-list documentation.
17486 gitweb: do not run "git diff" that is Porcelain
17490 Fix escaping of glob special characters in pathspecs
17492 Linus Torvalds (4):
17493 Split up default "core" config parsing into helper routine
17494 Split up default "user" config parsing into helper routine
17495 Split up default "i18n" and "branch" config parsing into helper routines
17496 Add config option to enable 'fsync()' of object files
17499 Fail properly when cloning from invalid HTTP URL
17502 reflog test: add more tests for 'reflog delete'
17505 Documentation: rev-list-options: Fix -g paragraph formatting
17508 Version v1.5.6.5; changes since v1.5.6.4:
17509 -----------------------------------------
17511 Anders Melchiorsen (1):
17512 Documentation: fix diff.external example
17514 Björn Steinbrink (1):
17515 index-pack.c: correctly initialize appended objects
17518 t/t4202-log.sh: add newline at end of file
17520 Ciaran McCreesh (1):
17521 Make git-add -i accept ranges like 7-
17524 init: handle empty "template" parameter
17527 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
17529 Johannes Schindelin (1):
17530 sort_in_topological_order(): avoid setting a commit flag
17532 Jonathan Nieder (2):
17533 fix usage string for git grep
17534 git-diff(1): "--c" -> "--cc" typo fix
17536 Junio C Hamano (12):
17537 refresh-index: fix bitmask assignment
17538 tests: propagate $(TAR) down from the toplevel Makefile
17539 Makefile: fix shell quoting
17540 make sure parsed wildcard refspec ends with slash
17541 Documentation: clarify diff --cc
17542 Update my e-mail address
17543 Start 1.5.6.5 RelNotes to describe accumulated fixes
17544 builtin-name-rev.c: split deeply nested part from the main function
17545 RelNotes 1.5.6.5 updates
17546 fix diff-tree --stdin documentation
17547 Files given on the command line are relative to $cwd
17550 Linus Torvalds (1):
17551 diff.renamelimit is a basic diff configuration
17554 Documentation: typos / spelling fixes in older RelNotes
17556 Peter Valdemar Mørch (1):
17557 send-email: find body-encoding correctly
17559 Pierre Habouzit (2):
17560 git-checkout: fix command line parsing.
17561 git-submodule: move ill placed shift.
17564 git-name-rev: allow --name-only in combination with --stdin
17567 git-name-rev: don't use printf without format
17570 builtin-revert.c: typofix
17573 Propagate -u/--upload-pack option of "git clone" to transport.
17576 Version v1.5.6.4; changes since v1.5.6.3:
17577 -----------------------------------------
17579 Dmitry Potapov (3):
17580 Fix buffer overflow in git-grep
17581 Fix buffer overflow in git diff
17582 Fix buffer overflow in prepare_attr_stack
17584 Johannes Schindelin (3):
17585 git daemon: avoid calling syslog() from a signal handler
17586 Add pretty format %aN which gives the author name, respecting .mailmap
17587 git fetch-pack: do not complain about "no common commits" in an empty repo
17590 t7600-merge: Use test_expect_failure to test option parsing
17592 Junio C Hamano (4):
17593 Start preparing 1.5.6.4 release notes
17594 rev-list: honor --quiet option
17595 http-fetch: do not SEGV after fetching a bad pack idx file
17598 Lars Noschinski (1):
17599 git-cvsserver: fix call to nonexistant cleanupWorkDir()
17601 Lukas Sandström (1):
17602 git-mailinfo: Fix getting the subject from the in-body [PATCH] line
17605 builtin-rm: fix index lock file path
17608 Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
17610 Shawn O. Pearce (9):
17611 Correct pack memory leak causing git gc to try to exceed ulimit
17612 bash completion: Improve responsiveness of git-log completion
17613 bash completion: Don't offer "a.." as a completion for "a."
17614 bash completion: Append space after file names have been completed
17615 bash completion: Resolve git show ref:path<tab> losing ref: portion
17616 index-pack: Refactor base arguments of resolve_delta into a struct
17617 index-pack: Chain the struct base_data on the stack for traversal
17618 index-pack: Track the object_entry that creates each base_data
17619 index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
17622 rebase-i: keep old parents when preserving merges
17623 api-run-command.txt: typofix
17626 Version v1.5.6.3; changes since v1.5.6.2:
17627 -----------------------------------------
17630 git-clone: remove leftover debugging fprintf().
17633 builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
17634 convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
17635 diff.c: Use 'git_config_string' to get 'diff.external'
17636 http.c: Use 'git_config_string' to clean up SSL config.
17637 builtin-commit.c: Use 'git_config_string' to get 'commit.template'
17639 Christian Couder (1):
17640 Fix "config_error_nonbool" used with value instead of key
17643 git-svn.perl: workaround assertions in svn library 1.5.0
17646 make deleting a missing ref more quiet
17648 Johannes Schindelin (1):
17649 run_command(): respect GIT_TRACE
17651 Junio C Hamano (6):
17652 attribute documentation: keep EXAMPLE at end
17653 clone -q: honor "quiet" option over native transports.
17654 mailinfo: feed the correct line length to decode_transfer_encoding()
17655 Start preparing release notes for 1.5.6.3
17656 t0004: fix timing bug
17659 Linus Torvalds (1):
17660 racy-git: an empty blob has a fixed object name
17662 Lukas Sandström (1):
17663 git-mailinfo: document the -n option
17666 git-submodule - Fix bugs in adding an existing repo as a module
17668 Matthew Ogilvie (1):
17669 Documentation cvs: Clarify when a bare repository is needed
17671 Mikael Magnusson (1):
17672 Fix grammar in git-rev-parse(1).
17674 Nikolaus Schulz (1):
17675 Documentation: be precise about which date --pretty uses
17678 Fix backwards-incompatible handling of core.sharedRepository
17681 bash: offer only paths after '--'
17683 Shawn O. Pearce (1):
17684 Remove unnecessary pack-*.keep file after successful git-clone
17687 git-am: Do not exit silently if committer is unset
17690 Version v1.5.6.2; changes since v1.5.6.1:
17691 -----------------------------------------
17693 Avery Pennarun (1):
17694 git-svn: avoid filling up the disk with temp files.
17696 Björn Steinbrink (1):
17697 git cat-file: Fix memory leak in batch mode
17700 git-svn: don't sanitize remote names in config
17703 fetch: report local storage errors in status table
17704 doc/rev-parse: clarify reflog vs --until for specifying revisions
17705 fetch: give a hint to the user when local refs fail to update
17708 avoid off-by-one error in run_upload_archive
17711 fix git config example syntax
17713 Johannes Schindelin (2):
17714 clone: respect url.insteadOf setting in global configs
17715 clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
17717 Junio C Hamano (9):
17718 Allow "git-reset path" when unambiguous
17719 diff --check: do not discard error status upon seeing a good line
17720 git-shell: accept "git foo" form
17723 Start draft release notes for 1.5.6.2
17724 Work around gcc warnings from curl headers
17725 Fix executable bits in t/ scripts
17728 Shawn O. Pearce (1):
17729 Fix describe --tags --long so it does not segfault
17732 Fix 'git show' on signed tag of signed tag of commit
17735 Version v1.5.6.1; changes since v1.5.6:
17736 ---------------------------------------
17739 git-merge.sh: fix typo in usage message: sucesses --> succeeds
17740 t7502-commit.sh: test_must_fail doesn't work with inline environment variables
17743 completion: add --graph to log command completion
17745 Dmitry Potapov (1):
17746 fix update-hook-example to work with packed tag references
17749 Documentation: fix formatting in git-svn
17750 git-svn: make rebuild respect rewriteRoot option
17753 for-each-ref: implement missing tag values
17754 clone: create intermediate directories of destination repo
17756 Junio C Hamano (2):
17757 diff -c/--cc: do not include uninteresting deletion before leading context
17760 Linus Torvalds (1):
17761 Make git_dir a path relative to work_tree in setup_work_tree()
17763 Michele Ballabio (1):
17764 parse-options.c: fix documentation syntax of optional arguments
17766 Patrick Higgins (1):
17767 Workaround for AIX mkstemp()
17770 git-rebase.sh: Add check if rebase is in progress
17771 api-builtin.txt: update and fix typo
17772 api-parse-options.txt: Introduce documentation for parse options API
17773 Extend parse-options test suite
17776 Version v1.5.6; changes since v1.5.6-rc3:
17777 -----------------------------------------
17779 Alejandro Mery (1):
17780 git-am: head -1 is obsolete and doesn't work on some new systems
17782 Christian Couder (1):
17783 Documentation: RelNotes-1.5.6: talk about renamed HTML files
17786 clean up error conventions of remote.c:match_explicit
17789 cpio is no longer used by git-clone
17790 Consistency: Use "libcurl" instead of "cURL library" and "curl"
17791 The "curl" executable is no longer required
17793 Junio C Hamano (7):
17794 Makefile: update check-docs target
17795 Update RPM spec to drop curl executable requirement
17796 diff.c: fix emit_line() again not to add extra line
17797 create_tempfile: make sure that leading directories can be accessible by peers
17798 sha1_file.c: simplify parse_pack_index()
17799 builtin-rerere: fix a small leak
17803 gitweb: quote commands properly when calling the shell
17804 gitweb: remove unused parse_ref method
17806 Linus Torvalds (1):
17807 write_loose_object: don't bother trying to read an old object
17810 run-command documentation: fix "memset()" parameter
17811 path-list documentation: document all functions and data structures
17814 Fix approxidate("never") to always return 0
17816 Pierre Habouzit (1):
17817 Make git reflog expire honour core.sharedRepository.
17820 diff: reset color before printing newline
17823 Version v1.5.6-rc3; changes since v1.5.6-rc2:
17824 ---------------------------------------------
17826 Ask Bjørn Hansen (2):
17827 gitweb setup instruction: rewrite HEAD and root as well
17828 send-email: Allow the envelope sender to be set via configuration
17830 Avery Pennarun (2):
17831 git-svn: don't append extra newlines at the end of commit messages.
17832 git-svn: test that extra blank lines aren't inserted in commit messages.
17834 Boyd Lynn Gerber (2):
17835 progress.c: avoid use of dynamic-sized array
17836 Port to 12 other Platforms.
17839 Improve sed portability
17841 Christian Couder (1):
17842 documentation: bisect: remove bits talking about a bisection branch
17844 Flavio Poletti (1):
17845 git-instaweb: improve auto-discovery of httpd and call conventions.
17848 fix typo in tutorial
17850 Geoffrey Irving (1):
17851 doc: adding gitman.info and *.texi to .gitignore
17853 Jakub Narebski (2):
17854 gitweb: Make it work with $GIT containing spaces
17855 Use 'trash directory' thoroughly in t/test-lib.sh
17858 document --pretty=tformat: option
17860 Johannes Schindelin (1):
17861 merge-recursive: respect core.autocrlf when writing out the result
17864 make_nonrelative_path: Use is_absolute_path()
17865 Remove exec bit from builtin-fast-export.c
17867 Junio C Hamano (8):
17868 http-push.c: remove duplicated code
17869 "remote prune": be quiet when there is nothing to prune
17870 Documentation/git-pull.txt: Use more standard [NOTE] markup
17871 Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
17872 user-manual: describe how higher stages are set during a merge
17873 t4126: fix test that happened to work due to timing
17874 sha1_file.c: dead code removal
17878 t1006-cat-file.sh: typo
17879 cat-file --batch / --batch-check: do not exit if hashes are missing
17880 Documentation/git-cat-file.txt: add missing line break
17881 t/.gitattributes: only ignore whitespace errors in test files
17883 Linus Torvalds (4):
17884 Consolidate SHA1 object file close
17885 Avoid cross-directory renames and linking on object creation
17886 Make loose object file reading more careful
17887 Simplify and rename find_sha1_file()
17889 Marius Storm-Olsen (1):
17890 Add testcase for merging in a CRLF repo
17893 git-submodule - Fix errors regarding resolve_relative_url
17895 Mikael Magnusson (1):
17899 Don't allocate too much memory in quote_ref_url
17902 Remove unused code in parse_commit_buffer()
17903 git-rebase -i: mention the short command aliases in the todo list
17904 git-read-tree: document -v option.
17907 remote show: fix the -n option
17908 builtin-remote: split show_or_prune() in two separate functions
17909 remote prune: print the list of pruned branches
17910 remote show: list tracked remote branches with -n
17912 Paul Mackerras (1):
17913 gitk: Handle detached heads better
17915 Philippe Bruhat (1):
17916 git-cvsimport: do not fail when CVSROOT is /
17919 git-send-email: allow whitespace in addressee list
17922 Ignore .gitattributes in bare repositories
17925 git add: add long equivalents of '-u' and '-f' options
17926 completion: add more 'git add' options
17928 Shawn O. Pearce (1):
17929 fast-export: Correctly generate initial commits with no parents
17932 git-commit.txt: Correct option alternatives
17933 git-commit.txt: Add missing long/short options
17934 Docs: Use "-l::\n--long\n" format in OPTIONS sections
17935 Docs: add some long/short options
17936 git-describe.txt: document --always
17937 git-name-rev.txt: document --no-undefined and --always
17940 Version v1.5.6-rc2; changes since v1.5.6-rc1:
17941 ---------------------------------------------
17944 graph API: fix "git log --graph --first-parent"
17945 git log --graph: print '*' for all commits, including merges
17948 Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
17950 Björn Steinbrink (1):
17951 name-rev: Fix segmentation fault when using --all
17953 Christian Couder (2):
17954 documentation: convert "diffcore" and "repository-layout" to man pages
17955 documentation: move git(7) to git(1)
17957 Daniel Barkalow (1):
17958 Use nonrelative paths instead of absolute paths for cloned repositories
17960 Dirk Süsserott (1):
17961 Documentation/git-mailsplit: Enhanced description of -o option
17963 Jakub Narebski (1):
17964 gitweb: Add charset info to "raw" output of 'text/plain' blobs
17967 Fix "git clone http://$URL" to check out the worktree when asked
17969 Junio C Hamano (6):
17970 t7502: do not globally unset GIT_COMMITTER_* environment variables
17971 t7502: tighten loosely written test sequence
17972 Documentation: git-log cannot use rev-list specific options
17973 t7502: honor SHELL_PATH
17978 cat-file --batch: flush stdout also when objects are missing
17979 git-for-each-ref.txt: minor improvements
17981 Michael Dressel (1):
17982 describe: match pattern for lightweight tags too
17985 Strbuf documentation: document most functions
17988 Print info about "git help COMMAND" on git's main usage pages
17991 Version v1.5.6-rc1; changes since v1.5.6-rc0:
17992 ---------------------------------------------
17995 graph API: improve display of merge commits
17996 graph API: avoid printing unnecessary padding before some octopus merges
17998 Christian Couder (2):
17999 bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
18000 Documentation: convert "glossary" and "core-tutorial" to man pages
18002 Christian Engwer (1):
18003 git-svn fails in prop_walk if $self->{path} is not empty
18005 Dmitry V. Levin (1):
18006 builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
18009 Documentation/git-bundle.txt: fix synopsis
18010 commit --interactive: properly update the index before commiting
18012 Jakub Narebski (2):
18013 gitweb: Remove gitweb/test/ directory
18014 gitweb: Fix "next" link on bottom of page
18017 git-reset: honor -q and do not show progress message
18020 clone: make sure we support the transport type
18022 Johannes Schindelin (1):
18023 hg-to-git: add --verbose option
18026 t5700-clone-reference: Quote $U
18027 Revert "filter-branch: subdirectory filter needs --full-history"
18028 rebase --interactive: Compute upstream SHA1 before switching branches
18030 John J. Franey (1):
18031 Clarify description of <repository> argument to pull/fetch for naming remotes.
18033 Junio C Hamano (25):
18034 tests: do not use implicit "git diff --no-index"
18035 diff-files: do not play --no-index games
18036 "git diff": do not ignore index without --no-index
18037 Update draft release notes for 1.5.6
18038 log --graph: do not accept log --graphbogus
18039 log --pretty: do not accept bogus "--prettyshort"
18040 Release Notes for 1.5.5.2
18041 Documentation/git.txt: link to 1.5.5.2 documentation.
18042 Makefile: fix dependency on wt-status.h
18043 show-branch --current: do not barf on detached HEAD
18044 git-diff: allow --no-index semantics a bit more
18045 git diff --no-index: default to page like other diff frontends
18047 t5100: Avoid filename "nul"
18048 Git::cat_blob: allow using an empty blob to fix git-svn breakage
18049 fix sha1_pack_index_name()
18050 Manual subsection to refer to other pages is SEE ALSO
18051 Documentation: git-cherry uses git-patch-id
18052 "git checkout -- paths..." should error out when paths cannot be written
18053 checkout: make reset_clean_to_new() not die by itself
18054 checkout: consolidate reset_{to_new,clean_to_new}()
18055 unpack_trees(): allow callers to differentiate worktree errors from merge errors
18056 checkout: "best effort" checkout
18057 commit: drop duplicated parents
18060 Karl Hasselström (3):
18061 Add some tests for git update-ref -d
18062 Fix path duplication in git svn commit-diff
18063 Revert "git.el: Set process-environment instead of invoking env"
18066 Documentation/git-filter-branch.txt: Fix description of --commit-filter
18069 gitweb: only display "next" links in logs if there is a next page
18070 t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
18071 Git.pm: fix documentation of hash_object
18072 glossary: improve a few links
18073 Git.pm: fix return value of config method
18075 Linus Torvalds (2):
18076 Make pack creation always fsync() the result
18077 Remove now unnecessary 'sync()' calls
18080 git-init: accept --bare option
18082 Marius Storm-Olsen (2):
18083 Clearify the documentation for core.ignoreStat
18084 Add shortcut in refresh_cache_ent() for marked entries.
18086 Michele Ballabio (1):
18087 Documentation: fix graph in git-rev-parse.txt
18090 Revision walking documentation: document most important functions
18093 make verify-pack a bit more useful with bad packs
18096 rollback lock files on more signals than just SIGINT
18099 builtin-fast-export: Only output a single parent per line
18102 Add a --dry-run option to git-svn rebase
18104 Shawn O. Pearce (8):
18105 git-gui: Add a --trace command line option
18106 git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
18107 Don't diff empty tree on branch creation in paranoid update hook
18108 Don't load missing ACL files in paranoid update hook
18109 Ignore no-op changes in paranoid update hook
18110 Remove unused remote_prefix member in builtin-remote
18111 Make "git-remote prune" delete refs according to fetch specs
18112 Make "git-remote rm" delete refs acccording to fetch specs
18115 Add test cases for git-am
18116 Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
18119 git-gui: Vertically align textboxes with labels
18122 Version v1.5.6-rc0; changes since v1.5.5.6:
18123 -------------------------------------------
18126 Add tests for git cat-file
18127 git-cat-file: Small refactor of cmd_cat_file
18128 git-cat-file: Make option parsing a little more flexible
18129 git-cat-file: Add --batch-check option
18130 git-cat-file: Add --batch option
18131 Move git-hash-object tests from t5303 to t1007
18132 Add more tests for git hash-object
18133 git-hash-object: Add --stdin-paths option
18134 Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
18135 Git.pm: Add hash_and_insert_object and cat_blob
18136 git-svn: Speed up fetch
18138 Adam Simpkins (11):
18139 Remove dead code: show_log() sep argument and diff_options.msg_sep
18140 log: print log entry terminator even if the message is empty
18141 revision API: split parent rewriting and parent printing options
18142 Add history graph API
18143 log and rev-list: add --graph option
18144 graph API: eliminate unnecessary indentation
18145 graph API: fix graph mis-alignment after uninteresting commits
18146 graph API: don't print branch lines for uninteresting merge parents
18147 log --graph --left-right: show left/right information in place of '*'
18148 Fix output of "git log --graph --boundary"
18149 get_revision(): honor the topo_order flag for boundary commits
18152 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
18153 Improve reporting of errors in config file routines
18154 Make the exit code of add_file_to_index actually useful
18155 Extend interface of add_files_to_cache to allow ignore indexing errors
18156 Add --ignore-errors to git-add to allow it to skip files with read errors
18157 Add a test for git-add --ignore-errors
18158 Add a config option to ignore errors for git-add
18159 Ensure that a test is run in the trash directory
18160 Fix t6031 on filesystems without working exec bit
18161 Fix t3701 if core.filemode disabled
18163 Anders Waldenborg (1):
18164 gitweb: Convert string to internal form before chopping in chop_str
18166 Avery Pennarun (3):
18167 git-svn: add documentation for --use-log-author option.
18168 git-svn: Add --add-author-from option.
18169 git-svn: add documentation for --add-author-from option.
18171 Bart Trojanowski (1):
18172 make git-status use a pager
18175 filter-branch.sh: support nearly proper tag name filtering
18176 compat/fopen.c: avoid clobbering the system defined fopen macro
18177 repack: modify behavior of -A option to leave unreferenced objects unpacked
18178 git-gc: always use -A when manually repacking
18179 builtin-gc.c: deprecate --prune, it now really has no effect
18180 builtin-clone.c: Need to closedir() in copy_or_link_directory()
18181 t/Makefile: "trash" directory was renamed recently
18184 git-rebase.sh: Fix --merge --abort failures when path contains whitespace
18185 config.c: Escape backslashes in section names properly
18186 git-send-email.perl: Handle shell metacharacters in $EDITOR properly
18187 test-lib.sh: Add a test_set_editor function to safely set $VISUAL
18188 Use test_set_editor in t9001-send-email.sh
18189 test-lib.sh: Fix some missing path quoting
18190 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
18191 Don't use the 'export NAME=value' in the test scripts.
18192 Fix tests breaking when checkout path contains shell metacharacters
18193 Rename the test trash directory to contain spaces.
18195 Caio Marcelo de Oliveira Filho (1):
18196 git-format-patch: add --no-binary to omit binary changes in the patch.
18199 Documentation/git-prune.txt: document unpacked logic
18200 Documentation/git-repack.txt: document new -A behaviour
18203 Updated status to show 'Not currently on any branch' in red
18205 Christian Couder (21):
18206 bisect: add "git bisect help" subcommand to get a long usage string
18207 help: use man viewer path from "man.<tool>.path" config var
18208 documentation: help: add "man.<tool>.path" config variable
18209 help: use "man.<tool>.cmd" as custom man viewer command
18210 documentation: help: add info about "man.<tool>.cmd" config var
18211 documentation: web--browse: add a note about konqueror
18212 rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
18213 rev-parse: fix --verify to error out when passed junk after a good rev
18214 Documentation: hooks: fix missing verb in pre-applypatch description
18215 Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
18216 Documentation: improve "add", "pull" and "format-patch" examples
18217 Documentation: bisect: add a few "git bisect run" examples
18218 rev-parse: add test script for "--verify"
18219 rev-parse: fix using "--default" with "--verify"
18220 rev-parse --verify: do not output anything on error
18221 Documentation: rev-parse: add a few "--verify" and "--default" examples
18222 bisect: add test cases to check that "git bisect start" is atomic
18223 bisect: fix left over "BISECT_START" file when starting with junk rev
18224 bisect: trap critical errors in "bisect_start"
18225 bisect: use a detached HEAD to bisect
18226 Documentation: convert tutorials to man pages
18228 Christian Stimming (3):
18229 git-gui: Update German translation
18230 gitk: Update German translation
18231 gitk: German translation again updated
18233 Clemens Buchacher (2):
18234 Reset the signal being handled
18235 http-push: remove remote locks on exit signals
18237 Clifford Caoile (1):
18238 git.el: Set process-environment instead of invoking env
18241 completion: allow 'git remote' subcommand completion
18242 completion: remove use of dashed git commands
18243 Allow cherry-pick (and revert) to add signoff line
18245 Daniel Barkalow (12):
18246 Make walker.fetch_ref() take a struct ref.
18247 Make ls-remote http://... list HEAD, like for git://...
18248 Mark the list of refs to fetch as const
18249 Add a lockfile function to append to a file
18250 Add a library function to add an alternate to the alternates file
18251 Have a constant extern refspec for "--tags"
18252 Allow for having for_each_ref() list extra refs
18253 Add a function to set a non-default work tree
18254 Provide API access to init_db()
18256 clone: fall back to copying if hardlinking fails
18257 Test that --reference actually suppresses fetching referenced objects
18259 Dmitry Potapov (1):
18260 git-init: autodetect core.ignorecase
18262 Dustin Sallings (2):
18263 Allow tracking branches to set up rebase by default.
18264 Allow tracking branches to set up rebase by default.
18267 git-svn: fix cloning of HTTP URLs with '+' in their path
18269 Frank Lichtenheld (4):
18270 var: Don't require to be in a git repository.
18271 Git.pm: Don't require a repository instance for config
18272 Git.pm: Don't require repository instance for ident
18273 send-email: Don't require to be called in a repository
18276 gitweb: fallback to system-wide config file if default config does not exist
18277 gitweb: fallback to system-wide config file (fixup)
18278 gitk: Makefile/install: force permissions when installing files and dirs
18280 Govind Salinas (1):
18281 pretty.c: add %x00 format specifier.
18283 Gustaf Hendeby (6):
18284 git-svn: Make create-ignore use git add -f
18285 Documentation: Add create-ignore to git svn manual
18286 Documentation/config.txt: Add git-gui options
18287 Documentation: Add missing git svn commands
18288 Documentation: Fix skipped section level
18289 Make git add -n and git -u -n output consistent
18292 Make core.sharedRepository more generic
18293 Document functions xmemdupz(), xread() and xwrite()
18294 Die for an early EOF in a file reading loop
18295 Make read_in_full() and write_in_full() consistent with xread() and xwrite()
18296 Cleanup xread() loops to use read_in_full()
18297 Add log.date config variable
18298 Remove redundant code, eliminate one static variable
18300 Imran M Yousuf (1):
18301 Use '-f' option to point to the .gitmodules file
18303 Jakub Narebski (1):
18304 gitweb: Use feed link according to current view
18307 add--interactive: ignore mode change in 'p'atch command
18308 add--interactive: allow user to choose mode update
18309 git-fetch: always show status of non-tracking-ref fetches
18310 git-remote: show all remotes with "git remote show"
18311 Documentation: point git-prune users to git-gc
18312 add merge.renamelimit config option
18313 bump rename limit defaults
18314 diff: make "too many files" rename warning optional
18315 fix bsd shell negation
18316 t5000: tar portability fix
18317 clone: bsd shell portability fix
18318 filter-branch: fix variable export logic
18321 Add a test for another combination of --reference
18322 Add test for cloning with "--reference" repo being a subset of source repo
18324 Johannes Schindelin (10):
18325 Provide git_config with a callback-data parameter
18326 builtin-clone: fix initial checkout
18327 cvsexportcommit: chomp only removes trailing whitespace
18328 diff options: Introduce --ignore-submodules
18329 Teach update-index about --ignore-submodules
18330 Ignore dirty submodule states during rebase and stash
18331 cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
18332 submodule update: add convenience option --init
18333 pull --rebase: exit early when the working directory is dirty
18334 mailsplit and mailinfo: gracefully handle NUL characters
18337 builtin-commit.c: Remove a redundant assignment.
18338 git-gui: Report less precise object estimates for database compression
18339 compat-util: avoid macro redefinition warning
18342 Add otherwise missing --strict option to unpack-objects summary.
18344 Junio C Hamano (24):
18345 Optimize rename detection for a huge diff
18346 t5300: add test for "unpack-objects --strict"
18347 unpack-objects: fix --strict handling
18348 rebase [--onto O] A B: omit needless checkout
18349 sha1-lookup: more memory efficient search in sorted list of SHA-1
18350 diff: make --dirstat binary-file safe
18351 sha1-lookup: make selection of 'middle' less aggressive
18352 log: teach "terminator" vs "separator" mode to "--pretty=format"
18353 git_config_bool_or_int()
18354 write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
18355 diff-files: mark an index entry we know is up-to-date as such
18356 Fix git_config_bool_or_int
18357 First batch of post 1.5.5 updates
18358 diff: a submodule not checked out is not modified
18359 diff-lib.c: rename check_work_tree_entity()
18360 is_racy_timestamp(): do not check timestamp for gitlinks
18361 git-svn: add test for --add-author-from and --use-log-author
18362 builtin-apply: typofix
18363 builtin-apply: accept patch to an empty file
18364 builtin-apply: do not declare patch is creation when we do not know it
18365 unpack-trees: allow Porcelain to give different error messages
18366 "git-add -n -u" should not add but just report
18367 mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
18368 mailsplit: minor clean-up in read_line_with_nul()
18371 post-merge: Add it's not executed if merge failed.
18373 Krzysztof Kowalczyk (1):
18374 alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
18377 Add platform-independent .git "symlink"
18378 Teach resolve_gitlink_ref() about the .git file
18379 Teach git-submodule.sh about the .git file
18380 Teach GIT-VERSION-GEN about the .git file
18381 git-branch: add support for --merged and --no-merged
18382 git-branch.txt: compare --contains, --merged and --no-merged
18383 Add tests for `branch --[no-]merged`
18384 revision.c: really honor --first-parent
18386 Linus Torvalds (12):
18387 Make unpack_trees_options bit flags actual bitfields
18388 Move name hashing functions into a file of its own
18389 Make "index_name_exists()" return the cache_entry it found
18390 Make hash_name_lookup able to do case-independent lookups
18391 Add 'core.ignorecase' option
18392 Make branch merging aware of underlying case-insensitive filsystems
18393 Make unpack-tree update removed files before any updated files
18394 When adding files to the index, add support for case-independent matches
18395 Make git-add behave more sensibly in a case-insensitive environment
18396 Optimize match_pathspec() to avoid fnmatch()
18397 Avoid some unnecessary lstat() calls
18398 Optimize symlink/directory detection
18401 Documentation on --git-dir and --work-tree
18403 Marcel Koeppen (2):
18404 Replace in-place sed in t7502-commit
18405 Fix prepare-commit-msg hook and replace in-place sed
18408 Be more careful with objects directory permissions on clone
18410 Martin Koegler (3):
18411 unpack-objects: prevent writing of inconsistent objects
18412 receive-pack: allow using --strict mode for unpacking objects
18413 t5300: add test for "index-pack --strict"
18415 Matthew Ogilvie (3):
18416 git-cvsserver: add mechanism for managing working tree and current directory
18417 implement gitcvs.usecrlfattr
18418 git-cvsserver: add ability to guess -kb from contents
18420 Matthias Kestenholz (1):
18421 Use color.ui variable in scripts too
18424 git-svn: detect and fail gracefully when dcommitting to a void
18426 Michele Ballabio (4):
18427 gitk: Disable "Reset %s branch to here" when on a detached head
18428 gitk: Move es.po where it belongs
18429 builtin-cat-file.c: use parse_options()
18430 change quoting in test t1006-cat-file.sh
18433 Makefile: update the default build options for AIX
18436 git-gc --auto: add pre-auto-gc hook
18437 Documentation/hooks: add pre-auto-gc hook
18438 contrib/hooks: add an example pre-auto-gc hook
18439 git checkout: add -t alias for --track
18440 git-format-patch: add a new format.cc configuration variable
18441 git-send-email: add a new sendemail.cc configuration variable
18442 Add tests for sendemail.cc configuration variable
18443 INSTALL: add a note about GNU interactive tools has been renamed
18444 git-fast-import: rename cmd_*() functions to parse_*()
18445 git-merge: exclude unnecessary options from OPTIONS_SPEC
18446 CodingGuidelines: Add a note to avoid assignments inside if()
18449 pack-objects: small cleanup
18450 pack-objects: remove some double negative logic
18451 pack-objects: simplify the condition associated with --all-progress
18452 pack-objects: clean up write_object() a bit
18453 pack-objects: move compression code in a separate function
18454 pack-objects: allow for early delta deflating
18455 pack-objects: fix early eviction for max depth delta objects
18456 add a force_object_loose() function
18457 let pack-objects do the writing of unreachable objects as loose objects
18460 Add a remote.*.mirror configuration option
18461 add special "matching refs" refspec
18463 Paul Mackerras (40):
18464 gitk: Use git log without --topo-order and reorganize the commits ourselves
18465 gitk: Fix bug in assigning row numbers to arcs
18466 gitk: Fix bug in parsing multiple revision arguments
18467 gitk: Compute row numbers and order tokens lazily
18468 gitk: Fix a couple of bugs
18469 gitk: Fix more bugs resulting in Tcl "no such element in array" errors
18470 gitk: More bug fixes and cleanups
18471 gitk: Implement date mode in the new framework
18472 gitk: Fix another collection of bugs
18473 gitk: Don't try to show local changes from a head that isn't shown
18474 gitk: Keep the same commits visible as other commits come in
18475 gitk: Fix some corner cases in the targetid/targetrow stuff
18476 gitk: Fix a couple of bugs in the find function
18477 gitk: Fix potential bug with fake commit IDs in renumbervarc
18478 gitk: Index [fnvr]highlights by id rather than row
18479 gitk: Fix handling of flag arguments
18480 gitk: Fix a bug in make_disporder
18481 gitk: Select head of current branch by default
18482 gitk: Select something appropriate on cherry-pick, branch reset and checkout
18483 gitk: Fix bug where editing an existing view would cause an infinite loop
18484 gitk: Fix bug causing Tcl error when no commits are selected
18485 gitk: Fix cherry-picking to insert a real row not a fake row
18486 gitk: Cope better with getting commits that we have already seen
18487 gitk: Fix bug where arcs could get lost
18488 gitk: Handle updating with path limiting better
18489 gitk: Fix problems with target row stuff
18490 gitk: Don't filter view arguments through git rev-parse
18491 gitk: Correct a few strings and comments to say "git log"
18492 gitk: Fix some corner cases in computing vrowmod and displayorder
18493 gitk: Avoid a crash in selectline if commitinfo($id) isn't set
18494 gitk: Fix problem with target row not being in scroll region
18495 gitk: Reorganize processing of arguments for git log
18496 gitk: Fix handling of tree file list with special chars in names
18497 gitk: Make updates go faster
18498 gitk: Synchronize highlighting in file view for 'f' and 'b' commands
18499 gitk: Show current row number and total number of rows
18500 gitk: Add a progress bar for checking out a head
18501 gitk: Fix "wrong # coordinates" error on reload
18502 gitk: Fix bug where current row number display stops working
18503 gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
18506 Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
18508 Peter Karlsson (1):
18509 gitk: Initial Swedish translation.
18512 git-submodule summary: --for-status option
18513 builtin-status: submodule summary support
18514 builtin-status: Add tests for submodule summary
18515 t4027: test diff for submodule with empty directory
18516 Add t7506 to test submodule related functions for git-status
18518 Rafael Garcia-Suarez (1):
18519 Spelling fixes in the gitweb documentation
18522 bash: Add completion for gitk --merge
18523 Documentation gitk: Describe what --merge does
18526 doc: moved merge.* config variables into separate merge-config.txt
18527 merge, pull: introduce '--(no-)stat' option
18528 add 'merge.stat' config variable
18529 fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
18530 merge, pull: add '--(no-)log' command line option
18533 Preparation to call determine_author_info from prepare_to_commit
18534 commit: Show author if different from committer
18535 commit: Show committer if automatic
18538 gitk: Spanish translation of gitk
18540 Sebastian Schuberth (1):
18541 mergetool: Make ECMerge use the settings as specified by the user in the GUI
18543 Shawn O. Pearce (3):
18544 git-gui: Don't use '$$cr master' with aspell earlier than 0.60
18545 git-gui: Setup branch.remote,merge for shorthand git-pull
18546 git-gui: Delete branches with 'git branch -D' to clear config
18548 Steffen Prohaska (4):
18549 t0050: Test autodetect core.ignorecase
18550 t0050: Set core.ignorecase case to activate case insensitivity
18551 t0050: Add test for case insensitive add
18552 t0050: Fix merge test on case sensitive file systems
18555 builtin-apply.c: use git_config_string() to get apply_default_whitespace
18557 Stephen R. van den Berg (2):
18558 Simplify and fix --first-parent implementation
18559 git-svn: Same default as cvsimport when using --use-log-author
18562 Add svn-compatible "blame" output format to git-svn
18565 Documentation/git-web--browse.txt: fix small typo
18568 gitk: Allow users to view diffs in external diff viewer
18571 cvsexportcommit: Create config option for CVS dir
18574 Version v1.5.5.6; changes since v1.5.5.5:
18575 -----------------------------------------
18577 Junio C Hamano (2):
18578 gitweb: do not run "git diff" that is Porcelain
18582 Version v1.5.5.5; changes since v1.5.5.4:
18583 -----------------------------------------
18586 fix typo in tutorial
18589 Remove exec bit from builtin-fast-export.c
18591 Junio C Hamano (4):
18592 diff.c: fix emit_line() again not to add extra line
18593 git-shell: accept "git foo" form
18598 git-read-tree: document -v option.
18601 diff: reset color before printing newline
18604 Version v1.5.5.4; changes since v1.5.5.3:
18605 -----------------------------------------
18607 Björn Steinbrink (1):
18608 name-rev: Fix segmentation fault when using --all
18610 Junio C Hamano (1):
18614 git-for-each-ref.txt: minor improvements
18616 Michael Dressel (1):
18617 describe: match pattern for lightweight tags too
18620 Version v1.5.5.3; changes since v1.5.5.2:
18621 -----------------------------------------
18623 Christian Couder (1):
18624 bisect: print an error message when "git rev-list --bisect-vars" fails
18627 git-bisect.sh: don't accidentally override existing branch "bisect"
18628 Documentation/git-bundle.txt: fix synopsis
18629 commit --interactive: properly update the index before commiting
18631 Horst H. von Brand (1):
18632 Fix recipient santitization
18635 send-email: specify content-type of --compose body
18636 send-email: rfc2047-quote subject lines with non-ascii characters
18639 Revert "filter-branch: subdirectory filter needs --full-history"
18641 Junio C Hamano (3):
18642 Release Notes for 1.5.5.2
18643 show-branch --current: do not barf on detached HEAD
18647 gitweb: only display "next" links in logs if there is a next page
18649 Michele Ballabio (1):
18650 Documentation: fix graph in git-rev-parse.txt
18653 builtin-fast-export: Only output a single parent per line
18656 Version v1.5.5.2; changes since v1.5.5.1:
18657 -----------------------------------------
18659 A Large Angry SCM (1):
18660 git-repack: re-enable parsing of -n command line option
18663 Use "=" instead of "==" in condition as it is more portable
18664 Fix use after free() in builtin-fetch
18667 post-receive-email: fix accidental removal of a trailing space in signature line
18670 copy.c: copy_fd - correctly report write errors
18671 archive.c: format_subst - fixed bogus argument to memchr
18674 git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
18677 Remove 'header' from --signoff option description
18679 Dmitry Potapov (1):
18680 git-gc --prune is deprecated
18682 Dustin Sallings (1):
18683 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
18685 Florian Ragwitz (1):
18686 filter-branch: Documentation fix.
18689 diff-options.txt: document the new "--dirstat" option
18692 Add missing "short" alternative to --date in rev-list-options.txt
18695 Documentation/git-describe.txt: make description more readable
18698 Don't force imap.host to be set when imap.tunnel is set
18699 t5516: remove ambiguity test (1)
18700 doc/git-gc: add a note about what is collected
18701 push: allow unqualified dest refspecs to DWIM
18702 remote: create fetch config lines with '+'
18703 fix reflog approxidate parsing bug
18704 cvsimport: always pass user data to "system" as a list
18705 checkout: don't rfc2047-encode oneline on detached HEAD
18706 doc: clarify definition of "update" for git-add -u
18707 doc/git-daemon: s/uploadarchive/uploadarch/
18708 git-am: fix typo in usage message
18711 wt-status.h: declare global variables as extern
18712 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
18715 git-filter-branch: Clarify file removal example.
18716 git-show.txt: Not very stubby these days.
18718 Junio C Hamano (3):
18719 write-tree: properly detect failure to write tree objects
18720 clone: detect and fail on excess parameters
18721 fetch-pack: brown paper bag fix
18723 Linus Torvalds (1):
18724 fetch-pack: do not stop traversing an already parsed commit
18727 Linked glossary from cvs-migration page
18729 Matthew Ogilvie (1):
18730 gitattributes: Fix subdirectory attributes specified from root directory
18733 svn-git: Use binmode for reading/writing binary rev maps
18736 diff options documentation: refer to --diff-filter in --name-status
18739 Amend git-push refspec documentation
18741 Shawn O. Pearce (1):
18742 Clarify repack -n documentation
18744 Sitaram Chamarty (1):
18745 builtin-commit.c: add -u as short name for --untracked-files
18748 bash: Add completion for git diff --base --ours --theirs
18750 Thomas Guyot-Sionnest (1):
18751 git-svn bug with blank commits and author file
18753 martin f. krafft (2):
18754 Escape project name in regexp
18755 Escape project names before creating pathinfo URLs
18758 Version v1.5.5.1; changes since v1.5.5:
18759 ---------------------------------------
18761 Alberto Bertogli (1):
18762 builtin-apply: Show a more descriptive error on failure when opening a patch
18764 Björn Steinbrink (1):
18765 Fix section about backdating tags in the git-tag docs
18768 Fix documentation syntax of optional arguments in short options.
18769 core-tutorial.txt: Fix showing the current behaviour.
18771 Christian Couder (4):
18772 bisect: fix bad rev checking in "git bisect good"
18773 bisect: report bad rev better
18774 bisect: squelch "fatal: ref HEAD not a symref" misleading message
18775 git-bisect: make "start", "good" and "skip" succeed or fail atomically
18777 Clifford Caoile (1):
18778 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
18780 Daniel Barkalow (1):
18781 Fix config key miscount in url.*.insteadOf
18783 Dirk Süsserott (1):
18784 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
18786 Jakub Narebski (1):
18787 gitweb: Fix 'history' view for deleted files with history
18790 git-fetch: fix status output when not storing tracking ref
18793 Document option --only of git commit
18796 Clarify and fix English in "git-rm" documentation
18799 git-remote: reject adding remotes with invalid names
18801 Junio C Hamano (7):
18802 Document -w option to shortlog
18803 Documentation/git-submodule: typofix
18804 t7401: squelch garbage output
18805 rebase: do not munge commit log message
18806 git-am: minor cleanup
18807 am: POSIX portability fix
18810 Linus Torvalds (2):
18811 Ignore leading empty lines while summarizing merges
18812 git-am: cope better with an empty Subject: line
18815 git-submodule - possibly use branch name to describe a module
18818 Document that WebDAV doesn't need git on the server, and works over SSL
18820 Michele Ballabio (1):
18821 revision.c: make --date-order overriddable
18824 Force the medium pretty format on calls to git log
18827 git-submodule: Avoid 'fatal: cannot describe' message
18830 git-archive: ignore prefix when checking file attribute
18833 Clarify documentation of git-cvsserver, particularly in relation to git-shell
18836 git clean: Don't automatically remove directories when run within subdirectory
18837 git clean: Add test to verify directories aren't removed with a prefix
18840 Version v1.5.5; changes since v1.5.5-rc3:
18841 -----------------------------------------
18843 Christian Couder (2):
18844 git-gui: Update french translation
18845 test suite: remove useless TERM cruft in "t7005-editor.sh"
18848 git-svn: fix following renamed paths when tracking a single path
18851 gitk: Fix changing colors through Edit->Preferences
18853 Jakub Narebski (1):
18854 Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
18856 Junio C Hamano (2):
18857 Fix "git apply" to correctly enforce "match at the beginning"
18861 git-fetch: Don't trigger a bus error when given the refspec "tag"
18863 Michele Ballabio (1):
18864 git-gui: use +/- instead of ]/[ to show more/less context in diff
18867 Add interactive option in rebase command completion list.
18868 Add prefix oriented completions for diff and format-patch commands.
18871 git-pack-objects.txt: Make wording slightly less ambiguous
18872 Add description of OFS_DELTA to the pack format description
18874 Shawn O. Pearce (1):
18875 git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
18878 Version v1.5.5-rc3; changes since v1.5.5-rc2:
18879 ---------------------------------------------
18882 mktag.c: improve verification of tagger field and tests
18883 mktag.c: tweak validation of tagger field and adjust test script
18886 Silence cpio's "N blocks" output when cloning locally
18888 Christian Couder (1):
18889 help: Add a missing OPT_END().
18891 Damien Diederen (7):
18892 cvsserver: Respond to the 'editors' and 'watchers' commands
18893 cvsserver: Only print the file part of the filename in status header
18894 cvsserver: Do not include status output for subdirectories if -l is passed
18895 cvsserver: Add a few tests for 'status' command
18896 cvsserver: Implement update -p (print to stdout)
18897 cvsserver: Add test for update -p
18898 cvsserver: Use the user part of the email in log and annotate results
18901 git-svn: remove redundant slashes from show-ignore
18904 filter-branch: Test renaming directories in a tree-filter
18905 verify-tag: Clean up the temporary file if gpg cannot be started.
18906 t7004-tag: Skip more tests if gpg is not available.
18908 Jonathan del Strother (1):
18909 git-gui: Add shortcut keys for Show More/Less Context
18912 Allow git-cvsserver database table name prefix to be specified.
18914 Junio C Hamano (5):
18915 Add corner case tests for diff-index and diff-files
18916 diff-index: careful when inspecting work tree items
18917 diff-files: careful when inspecting work tree items
18918 Accept git aliases outside a git repository
18921 Marius Storm-Olsen (1):
18922 git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
18925 git-cvsserver: handle change type T
18927 Shawn O. Pearce (1):
18931 Describe the bug in handling filenames with funny characters in 'git add -i'
18933 veillette@yahoo.ca (1):
18934 filter-branch: Fix renaming a directory in the tree-filter
18937 Version v1.5.5-rc2; changes since v1.5.5-rc1:
18938 ---------------------------------------------
18941 t/t3800-mktag.sh: use test_must_fail rather than '!'
18943 Daniel Barkalow (2):
18944 Tighten refspec processing
18945 Fix branches file configuration
18947 Dirk Süsserott (1):
18948 Documentation: git-tag '-m'/'-F' implies '-a'
18950 Frank Lichtenheld (1):
18951 t9600-cvsimport.sh: set HOME before checking for cvsps availability
18954 imap-send: properly error out if imap.host is not set in config
18957 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
18958 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
18961 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
18963 Johannes Schindelin (2):
18964 RelNotes: mention checkout/branch's --track option, too
18965 init: show "Reinit" message even in an (existing) empty repository
18968 builtin-remote: Fix missing newline at end of listing of pushed branches
18970 Julian Phillips (1):
18971 Documentation/git-checkout: Update summary to reflect current abilities
18973 Junio C Hamano (7):
18974 refspec: allow colon-less wildcard "refs/category/*"
18975 git-fetch test: test tracking fetch results, not just FETCH_HEAD
18976 test_must_fail: 129 is a valid error code from usage()
18977 Update draft release notes for 1.5.4.5
18978 Update draft release notes for 1.5.5
18979 builtin-prune: protect objects listed on the command line
18982 Michele Ballabio (3):
18983 parse-options.c: introduce OPT_DATE
18984 Add tests for git-prune
18985 builtin-prune.c: use parse_options()
18988 Always set *nongit_ok in setup_git_directory_gently()
18991 Version v1.5.5-rc1; changes since v1.5.5-rc0:
18992 ---------------------------------------------
18995 builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
18996 t/t7003-filter-branch.sh: use test_must_fail rather than '!'
18998 Daniel Barkalow (3):
18999 Tighten refspec processing
19003 Eyvind Bernhardsen (2):
19004 fast-import: Allow "reset" to delete a new branch without error
19005 fast-import: Document the effect of "merge" with no "from" in a commit
19007 Johannes Schindelin (1):
19008 remote show: do not show symbolic refs
19010 Junio C Hamano (10):
19011 Makefile: DIFF_OBJS is not special at all these days
19012 Makefile: flatten enumeration of headers, objects and programs
19013 t1000: use "test_must_fail git frotz", not "! git frotz"
19014 git-merge-one-file: fix longstanding stupid thinko
19015 Test: catch if trash cannot be removed
19016 Add tests to catch problems with un-unlinkable symlinks
19017 Fix read-tree not to discard errors
19018 remote.c: Fix overtight refspec validation
19019 gc --auto: raise default auto pack limit from 20 to 50
19023 Add --reverse to the git-rev-list usage string
19024 Document the sendemail.smtpserverport config variable
19025 Don't try and percent-escape existing percent escapes in git-svn URIs
19026 Make git-svn tests behave better on OS X
19028 Linus Torvalds (3):
19029 Don't update unchanged merge entries
19030 Fix possible Solaris problem in 'checkout_entry()'
19031 Make revision limiting more robust against occasional bad commit dates
19033 Marius Storm-Olsen (1):
19034 git-p4: Optimize the fetching of data from perforce.
19037 Documentation/git-merge: document subtree strategy.
19040 make it easier for people who just want to get rid of 'git gc --auto'
19042 Ralf Wildenhues (1):
19043 Improve description of git filter-branch.
19046 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
19047 git-p4: Use P4EDITOR environment variable when set
19050 Version v1.5.5-rc0; changes since v1.5.4.7:
19051 -------------------------------------------
19053 Adam Piątyszek (1):
19054 git-gui: Add option for changing the width of the commit message text box
19057 Fix builtin checkout crashing when given an invalid path
19058 Fix test for cleanup failure in t7300 on Windows
19059 Do not use GUID on dir in git init --shared=all on FreeBSD
19060 git-gui: update russian translation
19062 Alexandre Julliard (5):
19063 git.el: Support for showing unknown/ignored directories.
19064 git.el: Added a command to amend a commit.
19065 git.el: Check for existing buffers on revert.
19066 git.el: Better handling of subprocess errors.
19067 git.el: Do not display empty directories.
19069 Andreas Ericsson (1):
19070 pack-objects: Add runtime detection of online CPU's
19072 Brandon Casey (13):
19073 builtin-reflog.c: fix typo that accesses an unset variable
19074 Add compat/fopen.c which returns NULL on attempt to open directory
19075 builtin-reflog.c: don't install new reflog on write failure
19076 reflog-delete: parse standard reflog options
19077 git-reflog: add option --rewrite to update reflog entries while expiring
19078 refs.c: make close_ref() and commit_ref() non-static
19079 git-reflog: add option --updateref to write the last reflog sha1 into the ref
19080 git-stash: add new 'drop' subcommand
19081 git-stash: add new 'pop' subcommand
19082 pack-objects: Print a message describing the number of threads for packing
19083 t3903-stash.sh: Add missing '&&' to body of testcase
19084 git-reflog.txt: Document new commands --updateref and --rewrite
19085 t3903-stash.sh: Add tests for new stash commands drop and pop
19088 compat: Add simplified merge sort implementation from glibc
19091 gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
19092 gitweb: Use the config file to set repository owner's name.
19095 Eliminate confusing "won't bisect on seeked tree" failure
19098 Make builtin-reset.c use parse_options.
19100 Charles Bailey (6):
19101 Tidy up git mergetool's backup file behaviour
19102 Changed an internal variable of mergetool to support custom commands
19103 Teach git mergetool to use custom commands defined at config time
19104 Add a very basic test script for git mergetool
19105 git-mergetool documentaiton: show toolnames in typewriter font
19106 merge-tool documentation: describe custom command usage
19108 Christian Couder (17):
19109 help: make 'git-help--browse' usable outside 'git-help'.
19110 help--browse: add '--config' option to check a config option for a browser.
19111 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
19112 instaweb: use 'git-web--browse' to launch browser.
19113 config: add test cases for empty value and no value config variables.
19114 Documentation: instaweb: add 'git-web--browse' information.
19115 web--browse: Add a few quotes in 'init_browser_path'.
19116 Documentation: add 'git-web--browse.txt' and simplify other docs.
19117 help.c: use 'git_config_string' to get 'help_default_format'.
19118 run-command: Redirect stderr to a pipe before redirecting stdout to stderr
19119 help: add "man.viewer" config var to use "woman" or "konqueror"
19120 Documentation: help: describe 'man.viewer' config variable
19121 help: implement multi-valued "man.viewer" config option
19122 Documentation: help: explain 'man.viewer' multiple values
19123 help: warn if specified 'man.viewer' is unsupported, instead of erroring out
19124 web--browse: use custom commands defined at config time
19125 Documention: web--browse: add info about "browser.<tool>.cmd" config var
19127 Christian Stimming (4):
19128 git-gui: (i18n) Fix a bunch of still untranslated strings.
19129 git-gui: Update German translation.
19130 git-gui: (i18n) Add newly added translation strings to template.
19131 git-gui: Update German translation.
19133 Clemens Buchacher (2):
19134 http-push: push <remote> :<branch> deletes remote branch
19135 http-push: add regression tests
19137 Daniel Barkalow (33):
19138 Test :/string form for checkout
19139 Reduce the number of connects when fetching
19140 Allow callers of unpack_trees() to handle failure
19141 Add flag to make unpack_trees() not print errors.
19142 Send unpack-trees debugging output to stderr
19143 Discard "deleted" cache entries after using them to update the working tree
19144 Add "skip_unmerged" option to unpack_trees.
19145 Build-in merge-recursive
19146 Move create_branch into a library file
19147 Use diff -u instead of diff in t7201
19148 Library function to check for unmerged index entries
19149 Move code to clean up after a branch change to branch.c
19151 Clean up reporting differences on branch switch
19152 API documentation for remote.h
19153 Add more tests for format-patch
19154 Improve message-id generation flow control for format-patch
19155 Export some email and pretty-printing functions
19156 Use ALLOC_GROW in remote.{c,h}
19157 Add a --cover-letter option to format-patch
19158 Add tests for extra headers in format-patch
19159 Fix format.headers not ending with a newline
19160 Combine To: and Cc: headers
19161 Support a --cc=<email> option in format-patch
19162 Resolve value supplied for no-colon push refspecs
19163 builtin-checkout.c: Remove unused prefix arguments in switch_branches path
19164 Add support for url aliases in config files
19165 Add API access to shortlog
19166 Improve collection of information for format-patch --cover-letter
19167 Always use the current connection's remote ref list in git protocol
19168 Use diff_tree() directly in making cover letter
19169 Write index file on any checkout of files
19170 Write diff output to a file in struct diff_options
19173 gitk: Don't show local changes when we there is no work tree
19176 git-send-email: Generalize auto-cc recipient mechanism.
19179 git.el: Set process-environment instead of invoking env
19182 cleanup: remove unused git_checkout_config
19183 whatchanged documentation: share description of --pretty with others
19184 specify explicit "--pretty=medium" with `git log/show/whatchanged`
19185 log/show/whatchanged: introduce format.pretty configuration
19187 Dmitry Potapov (3):
19188 git-web--browse: do not start the browser with nohup
19189 Make private quote_path() in wt-status.c available as quote_path_relative()
19190 git-clean: correct printing relative path
19193 git-svn: improve repository URL matching when following parents
19195 Florian La Roche (1):
19196 gitweb: Make feed entries point to commitdiff view
19198 Frank Lichtenheld (1):
19199 gc: Add --quiet option
19202 gitk: properly deal with tag names containing / (slash)
19203 git-merge-index documentation: clarify synopsis
19204 builtin-tag.c: remove cruft
19205 hash-object: cleanup handling of command line options
19207 Jakub Narebski (11):
19208 gitweb: Fix displaying unchopped argument in chop_and_escape_str
19209 gitweb: Add new option -nohtml to quot_xxx subroutines
19210 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
19211 gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
19212 gitweb: Better cutting matched string and its context
19213 Add '--fixed-strings' option to "git log --grep" and friends
19214 gitweb: Change parse_commits signature to allow for multiple options
19215 gitweb: Simplify fixed string search
19216 Documentation: Remove --{min,max}-age option from git-log(1)
19217 gitweb: Mark first match when searching commit messages
19218 gitweb: Fix and simplify pickaxe search
19221 Add a BuildRequires for gettext in the spec file.
19223 Jason McMullan (1):
19224 Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
19227 git-web--browse: fix misplaced quote in init_browser_path()
19228 git-help--browse: improve browser support under OS X
19229 builtin-checkout.c: fix possible usage segfault
19230 branch: optionally setup branch.*.merge from upstream local branches
19231 doc: documentation update for the branch track changes
19232 Correct git-pull documentation
19233 send-email: fix In-Reply-To regression
19234 pull: pass --strategy along to to rebase
19236 Jean-Luc Herren (1):
19237 fast-import: exit with proper message if not a git dir
19240 allow suppressing of global and system config
19241 fix config reading in tests
19242 hard-code the empty tree object
19243 add--interactive: handle initial commit better
19244 git_config_*: don't assume we are parsing a config file
19245 t3404: use configured shell instead of /bin/sh
19246 diff: fix java funcname pattern for solaris
19247 t9001: enhance fake sendmail test harness
19248 send-email: test compose functionality
19250 make alias lookup a public, procedural function
19251 help: respect aliases
19252 use build-time SHELL_PATH in test scripts
19253 rename: warn user when we have turned off rename detection
19254 allow git-am to run in a subdirectory
19255 Add a test for read-tree -u --reset with a D/F conflict
19256 gitk: make autoselect optional
19257 tr portability fixes
19258 t0050: perl portability fix
19259 more tr portability test script fixes
19260 grep portability fix: don't use "-e" or "-q"
19261 remove use of "tail -n 1" and "tail -1"
19262 add test_cmp function for test scripts
19263 t4020: don't use grep -a
19264 t6000lib: tr portability fix
19265 add NO_EXTERNAL_GREP build option
19266 filter-branch: don't use xargs -0
19267 filter-branch: use $SHELL_PATH instead of 'sh'
19268 t9112: add missing #!/bin/sh header
19269 t7505: use SHELL_PATH in hook
19270 t6000lib: re-fix tr portability
19273 Avoid unnecessary "if-before-free" tests.
19276 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
19277 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
19279 Johannes Schindelin (21):
19280 Teach "git reflog" a subcommand to delete single entries
19281 Also use unpack_trees() in do_diff_cache()
19282 Fix "git clone" for git:// protocol
19283 Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
19284 Introduce the config variable pack.packSizeLimit
19285 bisect view: check for MinGW32 and MacOSX in addition to X11
19286 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
19287 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
19288 completion: support format-patch's --cover-letter option
19289 path-list: add functions to work with unsorted lists
19290 parseopt: add flag to stop on first non option
19291 Test "git remote show" and "git remote prune"
19292 Make git-remote a builtin
19293 builtin-remote: prune remotes correctly that were added with --mirror
19294 Fix make_absolute_path() for parameters without a slash
19295 format-patch: use the diff options for the cover letter, too
19296 format-patch: wrap cover-letter's shortlog sensibly
19297 remote show: Clean up connection correctly if object fetch wasn't done
19298 remote: fix "update [group...]"
19299 builtin remote rm: remove symbolic refs, too
19300 gc: call "prune --expire 2.weeks.ago" by default
19303 Fix misuse of prefix_path()
19304 gitk: Heed the lines of context in merge commits
19305 Technical documentation of the run-command API.
19306 prefix_path: use is_absolute_path() instead of *orig == '/'
19307 start_command(), .in/.out/.err = -1: Callers must close the file descriptor
19308 start_command(), if .in/.out > 0, closes file descriptors, not the callers
19309 git-submodule summary: fix that some "wc" flavors produce leading spaces
19312 man pages are littered with .ft C and others
19313 shortlog: do not require to run from inside a git repository
19315 Junichi Uekawa (1):
19316 git-blame.el: show the when, who and what in the minibuffer.
19318 Junio C Hamano (93):
19319 index: be careful when handling long names
19320 Avoid running lstat(2) on the same cache entry.
19321 read-cache.c: fix a couple more CE_REMOVE conversion
19322 read-cache.c: introduce is_racy_timestamp() helper
19324 Sane use of test_expect_failure
19325 test: reword the final message of tests with known breakages
19326 known breakage: revision range computation with clock skew
19327 fix misuse of prefix_path()
19328 builtin-apply.c: refactor small part that matches context
19329 builtin-apply.c: restructure "offset" matching
19330 builtin-apply.c: push match-beginning/end logic down
19331 builtin-apply.c: make it more line oriented
19332 builtin-apply.c: optimize match_beginning/end processing a bit.
19333 builtin-apply.c: mark common context lines in lineinfo structure.
19334 builtin-apply.c: clean-up apply_one_fragment()
19335 builtin-apply.c: simplify calling site to apply_line()
19336 builtin-apply.c: do not feed copy_wsfix() leading '+'
19337 builtin-apply.c: move copy_wsfix() function a bit higher.
19338 builtin-apply.c: pass ws_rule down to match_fragment()
19339 git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
19340 core.whitespace: cr-at-eol
19341 Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
19342 Documentation/SubmittingPatches: discuss first then submit
19343 Documentation/SubmittingPatches: What's Acked-by and Tested-by?
19344 Make error messages from cherry-pick/revert more sensible
19345 setup: sanitize absolute and funny paths in get_pathspec()
19346 git-add: adjust to the get_pathspec() changes.
19347 builtin-mv: minimum fix to avoid losing files
19348 gitignore(5): Allow "foo/" in ignore list to match directory "foo"
19349 gitignore: lazily find dtype
19350 Define the project whitespace policy
19351 apply: do not barf on patch with too large an offset
19352 Update the main documentation (stale notes section)
19353 .mailmap: adjust to a recent patch application glitch.
19354 diff --relative: output paths as relative to the current subdirectory
19355 diff --relative: help working in a bare repository
19356 checkout: notice when the switched branch is behind or forked
19357 Documentation/SubmittingPatches - a suggested patch flow
19358 Sync with 1.5.4.2 and start 1.5.5 Release Notes
19359 sending errors to stdout under $PAGER
19360 merge-recursive: split low-level merge functions out.
19361 expose a helper function peel_to_type().
19362 checkout: tone down the "forked status" diagnostic messages
19363 checkout: work from a subdirectory
19364 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
19365 checkout: updates to tracking report
19366 gitweb: Better chopping in commit search results
19367 Add merge-subtree back
19368 checkout: show progress when checkout takes long time while switching branches
19369 ws_fix_copy(): move the whitespace fixing function to ws.c
19370 checkout: error out when index is unmerged even with -m
19371 diff --dirstat: saner handling of binary and unmerged files
19372 url rewriting: take longest and first match
19373 git-apply --whitespace=fix: fix off by one thinko
19374 Revert "pack-objects: Print a message describing the number of threads for packing"
19375 git-remote: do not complain on multiple URLs for a remote
19376 format-patch: remove a leftover debugging message
19377 tests: introduce test_must_fail
19378 Update draft release notes for 1.5.5
19379 t6024: move "git reset" to prepare for a test inside the test itself
19380 CodingGuidelines: spell out how we use grep in our scripts
19381 find_unique_abbrev(): redefine semantics
19382 Clean up find_unique_abbrev() callers
19383 diff-lib.c: constness strengthening
19384 diff: make sure work tree side is shown as 0{40} when different
19385 Update draft release notes for 1.5.5
19386 describe --always: fall back to showing an abbreviated object name
19387 git-describe: use tags found in packed-refs correctly
19388 describe: fix --long output
19389 describe: re-fix display_name()
19390 t6120 (describe): check --long properly
19391 Revert "receive-pack: use strict mode for unpacking objects"
19392 Revert "unpack-objects: prevent writing of inconsistent objects"
19393 fsck.c: fix bogus "empty tree" check
19394 am: read from the right mailbox when started from a subdirectory
19395 am: remove support for -d .dotest
19397 get_pathspec(): die when an out-of-tree path is given
19398 Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
19399 Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
19400 Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
19401 git-clean: add tests for relative path
19402 send-email: --no-signed-off-cc should suppress 'sob' cc
19403 traverse_trees_recursive(): propagate merge errors up
19404 git-gui: Simplify MSGFMT setting in Makefile
19405 Documentation/config: typofix
19406 Documentation/git-help: typofix
19407 read-tree() and unpack_trees(): use consistent limit
19408 Redo "add test_cmp function for test scripts"
19409 git-gui: Improve directions regarding POT update in po/README
19410 Resurrect git-rerere to contrib/examples
19411 Update draft release notes for 1.5.5
19413 Karl Hasselström (2):
19414 git-svn: Don't call git-repack anymore
19415 Let "git svn" run "git gc --auto" occasionally
19418 bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces
19420 Kristian Høgsberg (1):
19421 wt-status.c: no need for dup() dance anymore
19424 Simplify setup of $GIT_DIR in git-sh-setup.sh
19426 Linus Torvalds (22):
19427 Make on-disk index representation separate from in-core one
19428 Make run_diff_index() use unpack_trees(), not read_tree()
19429 Create pathname-based hash-table lookup into index
19430 Add "--dirstat" for some directory statistics
19431 gitk: learn --show-all output
19432 Add "--show-all" revision walker flag for debugging
19433 Fix name re-hashing semantics
19434 Name hash fixups: export (and rename) remove_hash_entry
19435 Use helper function for copying index entry information
19436 Be more verbose when checkout takes a long time
19437 Add 'df_name_compare()' helper function
19438 Make 'traverse_tree()' use linked structure rather than 'const char *base'
19439 Add return value to 'traverse_tree()' callback
19440 Make 'traverse_trees()' traverse conflicting DF entries in parallel
19441 Move 'unpack_trees()' over to 'traverse_trees()' interface
19442 Fix tree-walking compare_entry() in the presense of --prefix
19443 Add 'const' where appropriate to index handling functions
19444 Make 'unpack_trees()' take the index to work on as an argument
19445 Make 'unpack_trees()' have a separate source and destination index
19446 unpack_trees(): minor memory leak fix in unused destination index
19447 unpack_trees(): fix diff-index regression.
19448 Fix recent 'unpack_trees()'-related changes breaking 'git stash'
19450 Marco Costalba (1):
19451 Avoid a useless prefix lookup in strbuf_expand()
19454 git-submodule - Allow adding a submodule in-place
19456 Martin Koegler (28):
19457 git-fsck: report missing author/commit line in a commit as an error
19458 parse_object_buffer: don't ignore errors from the object specific parsing functions
19459 deref_tag: handle return value NULL
19460 deref_tag: handle tag->tagged = NULL
19461 check return code of prepare_revision_walk
19462 read_object_with_reference: don't read beyond the buffer
19463 get_sha1_oneline: check return value of parse_object
19464 mark_blob/tree_uninteresting: check for NULL
19465 reachable.c::add_one_tree: handle NULL from lookup_tree
19466 list-objects.c::process_tree/blob: check for NULL
19467 check results of parse_commit in merge_bases
19468 process_tag: handle tag->tagged == NULL
19469 reachable.c::process_tree/blob: check for NULL
19470 revision.c: handle tag->tagged == NULL
19471 parse_commit: don't fail, if object is NULL
19472 check return value from parse_commit() in various functions
19473 peel_onion: handle NULL
19474 add generic, type aware object chain walker
19475 builtin-fsck: move away from object-refs to fsck_walk
19476 Remove unused object-ref code
19477 builtin-fsck: reports missing parent commits
19478 builtin-fsck: move common object checking code to fsck.c
19479 add common fsck error printing function
19480 unpack-object: cache for non written objects
19481 unpack-objects: prevent writing of inconsistent objects
19482 index-pack: introduce checking mode
19483 receive-pack: use strict mode for unpacking objects
19484 fetch-pack: check parse_commit/object results
19486 Matthias Kestenholz (1):
19487 Add color.ui variable which globally enables colorization if set
19489 Michael Witten (3):
19490 git-send-email: ssh/login style password requests
19491 git-send-email: SIG{TERM,INT} handlers
19492 git-send-email: Better handling of EOF
19495 Add compat/snprintf.c for systems that return bogus
19496 autoconf: Test FREAD_READS_DIRECTORIES
19498 Michele Ballabio (7):
19499 gitk: Fix "Key bindings" message
19500 git-gui: fix typo in lib/spellcheck.tcl
19501 builtin-for-each-ref.c: fix typo in error message
19502 gitk: Mark another string for translation
19503 git-gui: update Italian translation
19504 gitk: initial Italian translation
19505 git-gui: remove spurious "fuzzy" attributes in po/it.po
19508 Work around curl-gnutls not liking to be reinitialized
19509 Add test for git rebase --abort
19510 Documentation/git-rebase.txt: Add --strategy to synopsys
19511 git rebase --abort: always restore the right commit
19512 t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
19515 git-clean: handle errors if removing files fails
19516 Improve t6029 to check the real "subtree" case
19517 Update Hungarian translation. 100% completed.
19518 git-gui: Updated Hungarian translation (e5fba18)
19520 Nanako Shiraishi (2):
19521 git-gui: Update Japanese translation
19522 git-gui: Update Japanese translation
19525 factorize revindex code out of builtin-pack-objects.c
19526 make verify_one_pack() a bit less wrong wrt packed_git structure
19527 fix unimplemented packed_object_info_detail() features
19528 add storage size output to 'git verify-pack -v'
19529 pack-objects: proper pack time stamping with --max-pack-size
19532 git-commit: support variable number of hook arguments
19533 git-commit: set GIT_EDITOR=: if editor will not be launched
19534 git-commit: Refactor creation of log message.
19535 git-commit: add a prepare-commit-msg hook
19537 Paul Mackerras (3):
19538 gitk: Only restore window size from ~/.gitk, not position
19539 gitk: Avoid Tcl error when switching views
19540 gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
19542 Pekka Kaitaniemi (1):
19543 gitk: Add horizontal scrollbar to the diff view
19545 Peter Karlsson (2):
19546 git-gui: Regenerated po template and merged translations with it
19547 git-gui: updated Swedish translation
19550 gitweb: Clearly distinguish regexp / exact match searches
19552 Philipp A. Hartmann (1):
19553 git-gui: if a background colour is set, set foreground colour as well
19555 Philippe Bruhat (3):
19556 cvsimport: have default merge regex allow for dashes in the branch name
19557 cvsimport: allow for multiple -M options
19558 cvsimport: document that -M can be used multiple times
19560 Pierre Habouzit (4):
19561 git-describe: Add a --match option to limit considered tags.
19562 git-name-rev: add a --(no-)undefined option.
19563 parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
19564 parse-options: new option type to treat an option-like parameter as an argument.
19567 git-submodule summary: code framework
19568 git-submodule summary: show commit summary
19569 git-submodule summary: limit summary size
19570 git-submodule summary: documentation
19571 git-submodule summary: test
19573 Rafael Garcia-Suarez (1):
19574 Make git-remote.perl "use strict" compliant
19576 Ralf Wildenhues (1):
19579 Robin Rosenberg (2):
19580 Make blame accept absolute paths
19581 Improve bash prompt to detect various states like an unfinished merge
19584 bash: add git-branch options
19585 bash: git-branch -d and -m lists only local branches
19586 bash: remove unnecessary conditions when checking for subcommands
19587 bash: refactor searching for subcommands on the command line
19588 bash: add new 'git stash' subcommands
19589 bash: add 'git svn' subcommands and options
19590 bash: use __gitdir when completing 'git rebase' options
19591 bash: fix long option with argument double completion
19592 update 'git rebase' documentation
19594 Samuel Tardieu (1):
19595 "remote update": print remote name being fetched from
19598 git-bundle.txt: Add different strategies to create the bundle
19599 git-describe: --long shows the object name even for a tagged commit
19600 clone: support cloning full bundles
19602 Sebastian Noack (1):
19603 git-svn: Don't prompt for client cert password everytime.
19605 Shawn O. Pearce (37):
19606 git-gui: Automatically spell check commit messages as the user types
19607 git-gui: Paper bag fix bad string length call in spellchecker
19608 git-gui: Correct size of dictionary name widget in options dialog
19609 Include annotated tags in fast-import crash reports
19610 Include the fast-import marks table in crash reports
19611 Finish current packfile during fast-import crash handler
19612 Update fast-import documentation to discuss crash reports
19613 Teach git-grep --name-only as synonym for -l
19614 git-gui: Ensure all spellchecker 'class' variables are initialized
19615 git-gui: Remove explicit references to 'aspell' in message strings
19616 git-gui: Only bind the spellcheck popup suggestion hook once
19617 git-gui: Catch and display aspell startup failures to the user
19618 git-gui: Gracefully display non-aspell version errors to users
19619 git-gui: Shorten Aspell version strings to just Aspell version number
19620 Optimize peel_ref for the current ref of a for_each_ref callback
19621 Teach git-describe to use peeled ref information when scanning tags
19622 Avoid accessing non-tag refs in git-describe unless --all is requested
19623 Teach git-describe --exact-match to avoid expensive tag searches
19624 Use git-describe --exact-match in bash prompt on detached HEAD
19625 Teach git-describe to verify annotated tag names before output
19626 Remove unused variable in builtin-fetch find_non_local_tags
19627 Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
19628 Ensure tail pointer gets setup correctly when we fetch HEAD only
19629 Allow builtin-fetch's find_non_local_tags to append onto a list
19630 Free the path_lists used to find non-local tags in git-fetch
19631 Teach upload-pack to log the received need lines to an fd
19632 Make git-fetch follow tags we already have objects for sooner
19633 Teach git-fetch to grab a tag at the same time as a commit
19634 Don't allow git-describe failures to go unnoticed in t6120
19635 Test for packed tags in git-describe output
19636 Add git-describe test for "verify annotated tag names on output"
19637 git-pack-objects: Automatically pack annotated tags if object was packed
19638 Teach fetch-pack/upload-pack about --include-tag
19639 Teach git-fetch to exploit server side automatic tag following
19640 bash: Remove completion of core.legacyheaders option
19641 git-gui: Don't translate the special Apple menu
19642 git-gui: Adjusted Japanese translation to updated POT
19644 Simon Hausmann (7):
19645 git-p4: Fix submit user-interface.
19646 git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
19647 git-p4: Remove --log-substitutions feature.
19648 git-p4: Clean up git-p4 submit's log message handling.
19649 git-p4: Removed git-p4 submit --direct.
19650 git-p4: git-p4 submit cleanups.
19651 git-p4: Fix import of changesets with file deletions
19653 Steffen Prohaska (4):
19654 safecrlf: Add mechanism to warn about irreversible crlf conversions
19655 gitk: Add checkbutton to ignore space changes
19656 t4014: Replace sed's non-standard 'Q' by standard 'q'
19657 Add tests for filesystem challenges (case and unicode normalization)
19660 bash: Add more long options to be completed with "git --<TAB>"
19663 Add `git svn blame' command
19666 git-p4: Fix indentation from tab to spaces
19669 git-p4: Fix an obvious typo
19670 git-p4: support exclude paths
19672 Tor Arvid Lund (1):
19673 git-p4: Support usage of perforce client spec
19675 Uwe Kleine-König (1):
19676 rev-list: add --branches, --tags and --remotes
19679 Add an --argscmd flag to get the list of refs to show
19682 git-gui: translate the remaining messages in zh_cn.po to chinese
19685 Version v1.5.4.7; changes since v1.5.4.6:
19686 -----------------------------------------
19688 Junio C Hamano (2):
19689 gitweb: do not run "git diff" that is Porcelain
19693 Version v1.5.4.6; changes since v1.5.4.5:
19694 -----------------------------------------
19696 A Large Angry SCM (1):
19697 git-repack: re-enable parsing of -n command line option
19699 Alberto Bertogli (1):
19700 builtin-apply: Show a more descriptive error on failure when opening a patch
19703 copy.c: copy_fd - correctly report write errors
19704 archive.c: format_subst - fixed bogus argument to memchr
19706 Björn Steinbrink (1):
19707 Fix section about backdating tags in the git-tag docs
19710 Fix documentation syntax of optional arguments in short options.
19711 core-tutorial.txt: Fix showing the current behaviour.
19713 Christian Couder (4):
19714 bisect: fix bad rev checking in "git bisect good"
19715 bisect: report bad rev better
19716 bisect: squelch "fatal: ref HEAD not a symref" misleading message
19717 git-bisect: make "start", "good" and "skip" succeed or fail atomically
19719 Clifford Caoile (1):
19720 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
19723 Remove 'header' from --signoff option description
19725 Dirk Süsserott (1):
19726 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
19728 Dustin Sallings (1):
19729 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
19731 Florian Ragwitz (1):
19732 filter-branch: Documentation fix.
19735 Documentation/git-describe.txt: make description more readable
19738 t5516: remove ambiguity test (1)
19739 fix reflog approxidate parsing bug
19740 cvsimport: always pass user data to "system" as a list
19741 doc: clarify definition of "update" for git-add -u
19742 doc/git-daemon: s/uploadarchive/uploadarch/
19743 git-am: fix typo in usage message
19746 Document option --only of git commit
19747 wt-status.h: declare global variables as extern
19748 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
19751 Clarify and fix English in "git-rm" documentation
19753 Junio C Hamano (7):
19754 Fix "git apply" to correctly enforce "match at the beginning"
19755 Document -w option to shortlog
19756 git-am: minor cleanup
19757 am: POSIX portability fix
19758 write-tree: properly detect failure to write tree objects
19759 git-shell: accept "git foo" form
19762 Linus Torvalds (2):
19763 Ignore leading empty lines while summarizing merges
19764 git-am: cope better with an empty Subject: line
19767 Linked glossary from cvs-migration page
19769 Matthew Ogilvie (1):
19770 gitattributes: Fix subdirectory attributes specified from root directory
19773 svn-git: Use binmode for reading/writing binary rev maps
19775 Michele Ballabio (1):
19776 revision.c: make --date-order overriddable
19779 diff options documentation: refer to --diff-filter in --name-status
19782 builtin-fast-export: Only output a single parent per line
19785 git-archive: ignore prefix when checking file attribute
19788 Clarify documentation of git-cvsserver, particularly in relation to git-shell
19790 Sitaram Chamarty (1):
19791 builtin-commit.c: add -u as short name for --untracked-files
19793 Thomas Guyot-Sionnest (1):
19794 git-svn bug with blank commits and author file
19797 Version v1.5.4.5; changes since v1.5.4.4:
19798 -----------------------------------------
19800 Andy Whitcroft (1):
19801 shortlog: take the first populated line of the description
19804 git-new-workdir: Share SVN meta data between work dirs and the repository
19807 t/t3800-mktag.sh: use test_must_fail rather than '!'
19809 Clemens Buchacher (1):
19810 merge-recursive: handle file mode changes
19812 Daniel Barkalow (2):
19813 Tighten refspec processing
19814 Fix branches file configuration
19817 git-svn: don't blindly append '*' to branch/tags config
19820 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
19822 Jakub Narebski (1):
19823 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
19826 t0021: tr portability fix for Solaris
19827 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
19829 Johannes Schindelin (3):
19830 launch_editor(): allow spaces in the filename
19831 git fetch: Take '-n' to mean '--no-tags'
19832 merge-file: handle empty files gracefully
19835 Make man page building quiet when DOCBOOK_XSL_172 is defined
19837 Junio C Hamano (9):
19838 filter-branch: handle "disappearing tree" case correctly in subdir filter
19839 git-pull documentation: warn about the option order
19840 quiltimport: fix misquoting of parsed -p<num> parameter
19841 format-patch: generate MIME header as needed even when there is format.header
19842 rebase -m: do not trigger pre-commit verification
19843 Start draft ReleaseNotes for 1.5.4.5
19844 git-fetch test: test tracking fetch results, not just FETCH_HEAD
19845 Update draft release notes for 1.5.4.5
19848 Linus Torvalds (1):
19849 rev-parse: fix meaning of rev~ vs rev~0.
19851 Marc-Andre Lureau (2):
19852 git-svn: fix find-rev error message when missing arg
19853 git-cvsimport: fix merging with remote parent branch
19856 git rebase --abort: always restore the right commit
19858 Pierre Habouzit (1):
19859 git-quiltimport: better parser to grok "enhanced" series files.
19862 Minor wording changes in the keyboard descriptions in git-add --interactive.
19865 Version v1.5.4.4; changes since v1.5.4.3:
19866 -----------------------------------------
19869 Really make the LF after reset in fast-import optional
19871 Björn Steinbrink (1):
19872 receive-pack: Initialize PATH to include exec-dir.
19875 builtin-reflog.c: don't install new reflog on write failure
19878 Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
19880 Caio Marcelo de Oliveira Filho (1):
19881 filter-branch documentation: non-zero exit status in command abort the filter
19884 Eliminate confusing "won't bisect on seeked tree" failure
19886 Daniel Barkalow (3):
19887 Use a single implementation and API for copy_file()
19888 Don't use GIT_CONFIG in t5505-remote
19889 Correct name of diff_flush() in API documentation
19892 templates/Makefile: don't depend on local umask setting
19893 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
19896 rev-parse: fix potential bus error with --parseopt option spec handling
19897 send-email: fix In-Reply-To regression
19900 revert: actually check for a dirty index
19903 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
19904 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
19906 Johannes Schindelin (4):
19907 http-push: avoid invalid memory accesses
19908 http-push: do not get confused by submodules
19909 http-push: avoid a needless goto
19910 cvsexportcommit: be graceful when "cvs status" reorders the arguments
19913 daemon: send more error messages to the syslog
19914 daemon: ensure that base-path is an existing directory
19917 Fix dcommit, rebase when rewriteRoot is in use
19919 Jonathan del Strother (1):
19920 Prompt to continue when editing during rebase --interactive
19922 Junio C Hamano (6):
19923 Fix "git log --merge --left-right"
19924 Start preparing for 1.5.4.4
19925 tests: introduce test_must_fail
19926 Update draft release notes for 1.5.4.4
19927 test-lib: fix TERM to dumb for test repeatability
19931 Fix incorrect wording in git-merge.txt.
19934 Set proxy override with http_init()
19935 Fix random crashes in http_cleanup()
19938 Documentation cherry-pick: Fix cut-and-paste error
19941 Documentation/git-filter-branch: add a new msg-filter example
19942 Documentation/git svn log: add a note about timezones.
19944 Pierre Habouzit (1):
19945 unquote_c_style: fix off-by-one.
19948 git-submodule: Fix typo 'url' which should be '$url'
19951 git.el: find the git-status buffer whatever its name is
19954 ident.c: reword error message when the user name cannot be determined
19956 Sebastian Noack (1):
19957 git-svn: Don't prompt for client cert password everytime.
19959 Shawn O. Pearce (6):
19960 Ensure 'make dist' compiles git-archive.exe on Cygwin
19961 Protect peel_ref fallback case from NULL parse_object result
19962 Correct fast-export file mode strings to match fast-import standard
19963 git-gui: Paper bag fix info dialog when no files are staged at commit
19964 Fix 'git remote show' regression on empty repository in 1.5.4
19965 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
19968 timezone_names[]: fixed the tz offset for New Zealand.
19970 Uwe Kleine-König (1):
19971 config.txt: refer to --upload-pack and --receive-pack instead of --exec
19974 Version v1.5.4.3; changes since v1.5.4.2:
19975 -----------------------------------------
19978 git-clone.sh: properly configure remote even if remote's head is dangling
19981 git-gui: support Git Gui.app under OS X 10.5
19982 send-email: squelch warning due to comparing undefined $_ to ""
19985 push: indicate partialness of error message
19986 Documentation/push: clarify matching refspec behavior
19987 push: document the status output
19988 hash: fix lookup_hash semantics
19990 Junio C Hamano (1):
19993 Kristian Høgsberg (1):
19994 Rename git-core rpm to just git and rename the meta-pacakge to git-all.
19997 Documentation/git-stash: document options for git stash list
19999 Pekka Kaitaniemi (1):
20000 Clarified the meaning of git-add -u in the documentation
20002 Shawn O. Pearce (5):
20003 git-gui: Ensure error dialogs always appear over all other windows
20004 git-gui: Paper bag fix error dialogs opening over the main window
20005 git-gui: Default TCL_PATH to same location as TCLTK_PATH
20006 git-gui: Avoid hardcoded Windows paths in Cygwin package files
20007 git-gui: Focus insertion point at end of strings in repository chooser
20009 Wincent Colaiuta (1):
20010 git-gui: relax "dirty" version detection
20013 Version v1.5.4.2; changes since v1.5.4.1:
20014 -----------------------------------------
20016 Christian Couder (8):
20017 config: add test cases for empty value and no value config variables.
20018 diff.c: replace a 'strdup' with 'xstrdup'.
20019 diff.c: remove useless check for value != NULL
20020 config: add 'git_config_string' to refactor string config variables.
20021 Add "const" qualifier to "char *pager_program".
20022 Add "const" qualifier to "char *editor_program".
20023 Add "const" qualifier to "char *excludes_file".
20024 diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
20026 Daniel Barkalow (1):
20027 Validate nicknames of remote branches to prohibit confusing ones
20029 David Steven Tweed (1):
20030 Make git prune remove temporary packs that look like write failures
20032 Frank Lichtenheld (1):
20033 config: Fix --unset for continuation lines
20036 builtin-commit: remove .git/SQUASH_MSG upon successful commit
20037 cvsimport: have default merge regex also match beginning of commit message
20040 Add a BuildRequires for gettext in the spec file.
20043 mailinfo: feed only one line to handle_filter() for QP input
20046 status: suggest "git rm --cached" to unstage for initial commit
20047 commit: discard index after setting up partial commit
20049 Johannes Schindelin (3):
20050 bisect: allow starting with a detached HEAD
20051 Document that the default of branch.autosetupmerge is true
20052 bisect: use verbatim commit subject in the bisect log
20055 upload-pack: Initialize the exec-path.
20058 man pages are littered with .ft C and others
20060 Junio C Hamano (31):
20061 git-pull documentation: fix markup
20062 archive-tar.c: guard config parser from value=NULL
20063 Add config_error_nonbool() helper function
20064 builtin-apply.c: guard config parser from value=NULL
20065 builtin-branch.c: guard config parser from value=NULL
20066 builtin-commit.c: guard config parser from value=NULL
20067 builtin-config.c: guard config parser from value=NULL
20068 builtin-log.c: guard config parser from value=NULL
20069 builtin-reflog.c: guard config parser from value=NULL
20070 builtin-show-branch.c: guard config parser from value=NULL
20071 builtin-tag.c: guard config parser from value=NULL
20072 connect.c: guard config parser from value=NULL
20073 convert.c: guard config parser from value=NULL
20074 diff.c: guard config parser from value=NULL
20075 git.c: guard config parser from value=NULL
20076 help.c: guard config parser from value=NULL
20077 http.c: guard config parser from value=NULL
20078 merge-recursive.c: guard config parser from value=NULL
20079 remote.c: guard config parser from value=NULL
20080 setup.c: guard config parser from value=NULL
20081 wt-status.c: guard config parser from value=NULL
20082 imap-send.c: guard config parser from value=NULL
20083 builtin-log.c: guard config parser from value=NULL
20084 config.c: guard config parser from value=NULL
20085 Revert "pack-objects: only throw away data during memory pressure"
20086 Protect get_author_ident_from_commit() from filenames in work tree
20087 diff.c: fixup garding of config parser from value=NULL
20088 diff: Fix miscounting of --check output
20089 filter-branch: handle filenames that need quoting
20090 Documentation/git-reset:
20093 Martin Koegler (1):
20094 pack-objects: only throw away data during memory pressure
20097 Work around curl-gnutls not liking to be reinitialized
20100 builtin-gc.c: guard config parser from value=NULL
20101 git clone -s documentation: force a new paragraph for the NOTE
20104 Documentation/git-reset: don't mention --mixed for selected-paths reset
20105 Documentation/git-reset: Add an example of resetting selected paths
20107 Sergei Organov (1):
20108 git-cvsimport.txt: fix '-M' description.
20110 Shawn O. Pearce (1):
20111 fast-import: check return value from unpack_entry()
20114 hg-to-git: fix parent analysis
20116 Uwe Kleine-König (1):
20117 rebase -i: accept -m as advertised in the man page
20120 Version v1.5.4.1; changes since v1.5.4:
20121 ---------------------------------------
20124 INSTALL: git-merge no longer uses cpio
20127 Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
20129 Junio C Hamano (3):
20130 Update stale documentation links from the main documentation.
20131 Fix "git-commit -C $tag"
20132 gitattributes: fix relative path matching
20135 git-am: fix type in its usage string
20136 git-remote documentation: fix synopsis to match description
20139 Fix typo in 'blame' documentation.
20142 Fix parsing numeric color values
20145 Version v1.5.4; changes since v1.5.4-rc5:
20146 -----------------------------------------
20149 git-relink: avoid hard linking in objects/info directory
20150 filter-branch.sh: remove temporary directory on failure
20151 filter-branch docs: remove brackets so not to imply revision arg is optional
20152 filter-branch: assume HEAD if no revision supplied
20155 gitweb: Make use of the $git_dir variable at sub git_get_project_description
20157 Christian Couder (3):
20158 Documentation: config: add "browser.<tool>.path".
20159 Documentation: help: specify supported html browsers.
20160 instaweb: use 'browser.<tool>.path' config option if it's set.
20162 Jakub Narebski (1):
20163 gitweb: Add info about $projectroot and $projects_list to gitweb/README
20165 Jean-Luc Herren (1):
20166 Documentation/git-cvsserver: Fix typo
20169 t9001: add missing && operators
20174 Johannes Schindelin (1):
20175 Add test for rebase -i with commits that do not pass pre-commit
20177 Junio C Hamano (4):
20178 reflog-expire: Avoid creating new files in a directory inside readdir(3) loop
20179 Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"
20180 Fix "git checkout -b foo ':/substring'"
20183 Michele Ballabio (1):
20184 Fix typo in a comment in t/test-lib.sh
20187 git rev-parse manpage: spelling fix
20189 Shawn O. Pearce (1):
20190 Use 'printf %s $x' notation in t5401
20193 gitweb: Convert generated contents to utf8 in commitdiff_plain
20196 Version v1.5.4-rc5; changes since v1.5.4-rc4:
20197 ---------------------------------------------
20200 Make t5710 more strict when creating nested repos
20203 git-commit: exit non-zero if we fail to commit the index
20206 git-svn: default to repacking every 1000 commits
20208 Gustaf Hendeby (1):
20209 send-email, fix breakage in combination with --compose
20211 Jakub Narebski (1):
20212 autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
20214 Johannes Schindelin (1):
20215 pull --rebase: be cleverer with rebased upstream branches
20217 Junio C Hamano (5):
20218 git-submodule: rename shell functions for consistency
20219 git-submodule: fix subcommand parser
20220 git-submodule: add test for the subcommand parser fix
20221 Clarify that http-push being temporarily disabled with older cURL
20225 Add a missing dependency on http.h
20226 Documentation: add a bit about sendemail.to configuration
20229 git-clone -s: document problems with git gc --prune
20230 git pull manpage: don't include -n from fetch-options.txt
20233 pack-objects: Fix segfault when object count is less than thread count
20235 Pierre Habouzit (1):
20236 parse-options: catch likely typo in presense of aggregated options.
20238 Robert Schiele (2):
20239 pre-POSIX.1-2001 systems do not have <sys/select.h>
20240 Makefile: customization for supporting HP-UX
20243 git-svn(1): update instructions for resuming a git-svn clone
20245 Shawn O. Pearce (10):
20246 git-gui: Honor the standard commit-msg hook
20247 git-gui: Correct window title for hook failure dialogs
20248 git-gui: Consolidate hook execution code into a single function
20249 git-gui: Correct encoding of glossary/fr.po to UTF-8
20250 Teach fast-import to honor pack.compression and pack.depth
20251 Document the hairy gfi_unpack_entry part of fast-import
20252 git-gui: Work around random missing scrollbar in revision list
20253 git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
20254 git-gui: Make the statistics of po2msg match those of msgfmt
20255 git-gui: Correctly cleanup msgfmt '1 message untranslated' output
20257 Steffen Prohaska (3):
20258 submodule: Document the details of the command line syntax
20259 t9400-git-cvsserver-server: Wrap setup into test case
20260 cvsserver: Fix for histories with multiple roots
20263 Version v1.5.4-rc4; changes since v1.5.4-rc3:
20264 ---------------------------------------------
20267 Correct spelling in diff.c comment
20270 close_lock_file(): new function in the lockfile API
20271 Improve use of lockfile API
20272 refs.c: rework ref_locks by abstracting from underlying struct lock_file
20273 fast-import.c: don't try to commit marks file if write failed
20275 Christian Couder (2):
20276 git-gui: Initial french translation
20277 git-gui: add french glossary: glossary/fr.po
20279 Christian Stimming (4):
20280 git-gui: Update glossary: add term "hunk"
20281 git-gui: Update German translation
20282 git-gui: Fix broken revert confirmation.
20283 git-gui: Improve German translation.
20286 Remove usage of git- (dash) commands from email hook
20287 cvsimport: remove last use of repo-config from git standard tools
20288 Update git-completion for new 'remote rm' option
20290 Dave Peticolas (1):
20291 Documentation: fix and clarify grammar in git-merge docs.
20293 Dmitry Potapov (1):
20294 treat any file with NUL as binary
20297 git-svn: handle leading/trailing whitespace from svnsync revprops
20299 Grégoire Barbier (4):
20300 http-push: disable http-push without USE_CURL_MULTI
20301 http-push: fix webdav lock leak.
20302 http-push: fail when info/refs exists and is already locked
20303 http-push and http-fetch: handle URLs without trailing /
20305 Jakub Narebski (1):
20306 autoconf: Add checking for unsetenv function
20308 Jean-Luc Herren (1):
20309 Make default pre-commit hook less noisy
20312 git-clean: fix off-by-one memory access when given no arguments
20313 color unchanged lines as "plain" in "diff --color-words"
20314 send-email: detect invocation errors earlier
20315 send-email: validate patches before sending anything
20316 send-email: add no-validate option
20319 fast-import: Don't use a maybe-clobbered errno value
20320 doc typo: s/prior committing/prior to committing/
20322 Johannes Schindelin (1):
20323 gitk: make Ctrl "+" really increase the font size
20325 Junio C Hamano (8):
20326 builtin-commit.c: remove useless check added by faulty cut and paste
20327 Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
20328 Fix git-rerere documentation
20329 Squelch bogus progress output from git-rebase--interactive
20330 Document lockfile API
20331 Officially deprecate repo-config.
20332 http-push: clarify the reason of error from the initial PROPFIND request
20335 Kristian Høgsberg (1):
20336 git-commit: fix double close(2) that can close a wrong file descriptor
20339 Move sha1_file_to_archive into libgit
20341 Linus Torvalds (4):
20342 Fix performance regression for partial commits
20343 Make builtin-commit.c more careful about parenthood
20344 Make 'git fsck' complain about non-commit branches
20345 Be more careful about updating refs
20348 hg-to-git: improve popen calls
20351 git-gui: Makefile - Handle $DESTDIR on Cygwin
20353 Martin Koegler (1):
20354 parse_commit_buffer: tighten checks while parsing
20357 Add using merge subtree How-To
20358 ls-remote: add -t and -h options.
20359 Include rev-list options in git-log manpage.
20361 Peter Karlsson (1):
20362 git-gui: Updated Swedish translation after mailing list review.
20364 Shawn O. Pearce (3):
20365 git-gui: Allow 'Create New Repository' on existing directories
20366 git-gui: Refresh file status description after hunk application
20367 Fix random fast-import errors when compiled with NO_MMAP
20370 core-tutorial typofix
20373 Version v1.5.4-rc3; changes since v1.5.4-rc2:
20374 ---------------------------------------------
20376 Alexandre Julliard (6):
20377 git.el: Support for getting diffs from inside the log-edit buffer.
20378 git.el: Retrieve the permissions for up-to-date files.
20379 git.el: Display file types and type changes.
20380 git.el: Make sure we never insert the same file twice.
20381 git.el: Refresh files from their real state upon commit.
20382 git.el: Make status refresh faster.
20385 git-gui: Make commit log messages end with a newline
20388 git-relink.txt: describe more clearly how hard linking occurs
20390 Charles Bailey (1):
20391 gitk: Fix the Makefile to cope with systems lacking msgfmt
20393 Christian Couder (1):
20394 Documentation: config: add 'help.*' and 'instaweb.*' variables.
20396 Christian Stimming (10):
20397 gitk i18n: Add Makefile with rules for po file creation and installation
20398 gitk i18n: Import msgcat for message string translation; load translation catalogs
20399 gitk i18n: Markup several strings for translation
20400 gitk i18n: Initial German translation
20401 gitk i18n: More markup -- various options menus
20402 gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
20403 gitk: Update and fix Makefile
20404 gitk: Update German translation
20405 gitk: Fix typo in user message.
20406 gitk: Update German translation.
20409 Documentation: rename gitlink macro to linkgit
20412 git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
20413 git-svn: unlink index files that were globbed, too
20414 git-svn: support for funky branch and project names over HTTP(S)
20415 git-svn: clarify the "Ignoring error from SVN" piece
20417 Florian La Roche (1):
20418 Change git-gc documentation to reflect gc.packrefs implementation.
20421 gitk: use user-configured background in view definition dialog
20423 Grégoire Barbier (1):
20424 Fix double-free() in http-push.c:remote_exists()
20426 Gustaf Hendeby (1):
20427 Documentation/user-manual.txt: fix typo
20429 J. Bruce Fields (1):
20430 Documentation: fix remote.<name>.skipDefaultUpdate description
20433 Make the git metapackage require the same version of the subpackages.
20436 config: handle lack of newline at end of file better
20437 git-reset: refuse to do hard reset in a bare repository
20438 add a "basic" diff config callback
20439 diff: load funcname patterns in "basic" config
20440 diff: remove lazy config loading
20441 add--interactive: remove unused diff colors
20442 add--interactive: allow diff colors without interactive colors
20443 Document the color.interactive semantics
20446 Fix grammar nits in documentation and in code comments.
20447 Don't access line[-1] for a zero-length "line" from fgets.
20448 bundle, fast-import: detect write failure
20450 Johannes Schindelin (2):
20451 Optimize prefixcmp()
20452 shortlog: mention the "-e" option in the usage
20455 git-gui: Move frequently used commands to the top of the context menu.
20456 recv_sideband: Do not use ANSI escape sequence on dumb terminals.
20458 Junio C Hamano (27):
20459 Documentation/git-submodule.txt: typofix
20460 "git pull --tags": error out with a better message.
20461 git-rebase -i behaves better on commits with incomplete messages
20462 git-rebase -i: clean-up error check codepath.
20463 lock_any_ref_for_update(): reject wildcard return from check_ref_format
20464 Update callers of check_ref_format()
20465 Uninline prefixcmp()
20466 git-clean: make "Would remove ..." path relative to cwd again
20467 t/t7600: avoid GNUism in grep
20468 t/t{3600,3800,5401}: do not use egrep when grep would do
20469 t/t3800: do not use a temporary file to hold expected result.
20470 Update draft release notes for 1.5.4
20471 git-stash clear: refuse to work with extra parameter for now
20472 git-rev-parse --symbolic-full-name
20473 filter-branch: work correctly with ambiguous refnames
20474 custom pretty format: tolerate empty e-mail address
20475 Documentation: remove gitman.info with "make clean"
20476 Documentation: fix "gitlink::foobar[s]"
20477 utf8: pick_one_utf8_char()
20478 utf8_width(): allow non NUL-terminated input
20479 diff: do not chomp hunk-header in the middle of a character
20480 Update draft release notes for 1.5.4
20482 "git-apply --check" should not report "fixed"
20483 pack-objects: remove redundant and wrong call to deflateEnd()
20484 RPM spec: include gitk message files.
20488 Trim leading / off of paths in git-svn prop_walk
20490 Marco Costalba (2):
20491 Document git-reset defaults to HEAD if no commit is given
20492 git-stash: use stdout instead of stderr for non error messages
20495 git-gui: Unconditionally use absolute paths with Cygwin
20496 Documentation/Makefile - honor $DESTDIR for quick-install target
20498 Martin Koegler (4):
20499 receive-pack: check object type of sha1 before using them as commits
20500 receive-pack: reject invalid refnames
20501 parse_tag_buffer: don't parse invalid tags
20502 tree-walk: don't parse incorrect entries
20504 Michael Stefaniuc (1):
20505 git-am: Run git gc only once and not for every patch.
20507 Michele Ballabio (1):
20508 Document some default values in config.txt
20511 git-sh-setup: document git_editor() and get_author_ident_from_commit()
20512 t/t7001: avoid unnecessary ERE when using grep
20515 slightly better auto gc message
20517 Paul Mackerras (2):
20518 gitk: Recode de.po to UTF-8
20519 gitk: Restore some widget options whose defaults changed in Tk 8.5
20521 Peter Karlsson (1):
20522 Added Swedish translation.
20524 Ralf Wildenhues (1):
20525 Documentation: typofix
20528 Allow git-mergetool to handle paths with a leading space
20530 Shawn O. Pearce (1):
20531 git-gui: Handle file mode changes (644->755) in diff viewer
20534 Version v1.5.4-rc2; changes since v1.5.4-rc1:
20535 ---------------------------------------------
20538 Allow selection of different cleanup modes for commit messages
20540 Arjen Laarhoven (1):
20541 Fix "git log --diff-filter" bug
20543 Charles Bailey (1):
20544 Remove old generated files from .gitignore.
20546 Gustaf Hendeby (2):
20547 Make git send-email accept $EDITOR with arguments
20548 shortlog manpage documentation: work around asciidoc markup issues
20550 Jakub Narebski (1):
20551 gitweb: fix whitespace in config_to_multi (indent with tab)
20554 clean up 1.5.4 release notes
20555 cvsimport: die on cvsps errors
20558 Don't dereference NULL upon lookup failure.
20560 Johannes Schindelin (2):
20561 Teach diff machinery to display other prefixes than "a/" and "b/"
20562 Mention git-shell's "cvs" substitution in the RelNotes
20564 Junio C Hamano (14):
20565 t4024: fix test script to use simpler sed pattern
20566 fix git commit --amend -m "new message"
20567 shell-scripts usage(): consistently exit with non-zero
20568 Documentation: ls-files -v is about "assume unchanged".
20569 Fix $EDITOR regression introduced by rewrite in C.
20570 t7005: do not exit inside test.
20571 builtin-commit: fix amending of the initial commit
20572 builtin-commit: avoid double-negation in the code.
20573 Documentation: describe 'union' low-level merge driver
20574 Fix documentation of --first-parent in git-log and copy it to git-rev-list
20575 combine-diff: Fix path quoting
20576 Fix rewrite_diff() name quoting.
20577 contrib: resurrect scripted git-revert.
20580 Linus Torvalds (1):
20581 Re(-re)*fix trim_common_tail()
20584 everyday: replace 'prune' and 'repack' with 'gc'
20586 Pierre Habouzit (3):
20587 git-tag: fix -l switch handling regression.
20588 Force the sticked form for options with optional arguments.
20589 parse-options: Add a gitcli(5) man page.
20592 Make "--pretty=format" parser a bit more careful.
20594 Shawn O. Pearce (2):
20595 Reallow git-rebase --interactive --continue if commit is unnecessary
20596 Improve error messages when int/long cannot be parsed from config
20598 Stefan Sperling (1):
20599 Small comment fix for git-cvsimport.
20601 Wincent Colaiuta (1):
20602 Emit helpful status for accidental "git stash" save
20605 Version v1.5.4-rc1; changes since v1.5.4-rc0:
20606 ---------------------------------------------
20608 Andy Whitcroft (1):
20609 git-svn: expand handling of From: and Signed-off-by:
20611 Charles Bailey (1):
20612 Fix git-instaweb breakage on MacOS X due to the limited sed functionality
20614 Christian Couder (1):
20615 git-help: add "help.format" config variable.
20617 David S. Miller (1):
20618 fast-import: fix unalinged allocation and access
20621 git-svn: unlink internal index files after operations
20622 git-svn: handle our top-level path being deleted and later re-added
20623 git-svn: avoid leaving leftover committer/author info in rebase
20624 git-svn: workaround a for broken symlinks in SVN
20625 git-svn: avoid warning when run without arguments
20627 Finn Arne Gangstad (1):
20628 Improved submodule merge support
20630 H.Merijn Brand (1):
20631 the use of 'tr' in the test suite isn't really portable
20633 J. Bruce Fields (8):
20634 whitespace: fix off-by-one error in non-space-in-indent checking
20635 whitespace: reorganize initial-indent check
20636 whitespace: minor cleanup
20637 whitespace: fix initial-indent checking
20638 whitespace: more accurate initial-indent highlighting
20639 whitespace: fix config.txt description of indent-with-non-tab
20640 builtin-apply: minor cleanup of whitespace detection
20641 builtin-apply: stronger indent-with-on-tab fixing
20643 Jakub Narebski (2):
20644 gitweb: disambiguate heads and tags withs the same name
20645 gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
20648 cvsexportcommit: fix massive commits
20649 trim_common_tail: brown paper bag fix.
20650 teach bash completion to treat commands with "--" as a helper
20651 rename git-browse--help to git-help--browse
20652 clone: correctly report http_fetch errors
20653 git-send-email: avoid duplicate message-ids
20654 test "git clone -o"
20657 git-filter-branch.sh: more portable tr usage: use \012, not \n.
20659 Johannes Schindelin (4):
20660 Support config variable diff.external
20661 Document diff.external and mergetool.<tool>.path
20662 rebase -p -i: handle "no changes" gracefully
20663 git show <tag>: show the tagger
20666 threaded pack-objects: Use condition variables for thread communication.
20667 Plug a resource leak in threaded pack-objects code.
20668 Clean up documentation that references deprecated 'git peek-remote'.
20669 filter-branch: Remove broken and unnecessary summary of rewritten refs.
20671 Junio C Hamano (18):
20672 git-commit: squelch needless message during an empty merge
20673 xdl_diff: identify call sites.
20674 xdi_diff: trim common trailing lines
20675 diff --check: minor fixups
20676 Add tests for "git diff --check" with core.whitespace options
20677 xdiff tail trimming: use correct type.
20678 commit: allow --amend to reuse message from another commit
20679 remote: Fix bogus make_branch() call in configuration reader.
20680 Rename git-browse-help helper to git-browse--help
20681 Retire git-runstatus for real.
20682 Start preparing the API documents.
20683 Update draft release notes for 1.5.4
20684 Re-re-re-fix common tail optimization
20685 builtin-commit: fix summary output.
20686 builtin-commit: make summary output consistent with status
20687 Documentation/git-submodule: refer to gitmodules(5)
20688 builtin-blame.c: remove unneeded memclr()
20691 Kristian Høgsberg (1):
20692 Use a strbuf for building up section header and key/value pair strings.
20697 Linus Torvalds (1):
20698 unpack-trees: FLEX_ARRAY fix
20701 clone: fix options '-o' and '--origin' to be recognised again
20704 Fix some more memory leaks in http-push.c
20705 Fix random sha1 in error message in http-fetch and http-push
20706 Remove the default_headers variable from http-push.c
20707 Remove a CURLOPT_HTTPHEADER (un)setting
20708 Avoid redundant declaration of missing_target()
20709 Use strbuf in http code
20710 Fix various memory leaks in http-push.c and http-walker.c
20711 Move fetch_ref from http-push.c and http-walker.c to http.c
20714 provide advance warning of some future pack default changes
20715 fix style of a few comments in diff-delta.c
20716 make 'git describe --all --contains' work
20719 gitweb: Make config_to_multi return [] instead of [undef]
20721 Pierre Habouzit (1):
20722 Fix segfault in diff-delta.c when FLEX_ARRAY is 1
20724 Ralf Wildenhues (1):
20725 Fix some documentation typos.
20728 Clarify error response from 'git fetch' for bad responses
20730 Sean Estabrooks (1):
20731 Fix interactive rebase to preserve author email address
20734 Fix spelling mistakes in user manual
20736 Shawn O. Pearce (2):
20737 Avoid update hook during git-rebase --interactive
20738 Catch and handle git-commit failures in git-rebase --interactive
20740 Wincent Colaiuta (5):
20741 "diff --check" should affect exit status
20742 Unify whitespace checking
20743 Make "diff --check" output match "git apply"
20744 Use shorter error messages for whitespace problems
20745 Test interaction between diff --check and --exit-code
20748 Documentation: describe pack idx v2
20751 Version v1.5.4-rc0; changes since v1.5.3.8:
20752 -------------------------------------------
20755 fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
20756 Fix a crash in ls-remote when refspec expands into nothing
20757 More updates and corrections to the russian translation of git-gui
20758 Rework make_usage to print the usage message immediately
20759 Updated russian translation of git-gui
20760 Do no colorify test output if stdout is not a terminal
20761 Add a test checking if send-pack updated local tracking branches correctly
20762 Update the tracking references only if they were succesfully updated on remote
20763 Fix dependencies of parse-options test program
20764 Do not generate full commit log message if it is not going to be used
20765 Simplify crud() in ident.c
20766 Fix git-fast-export for zero-sized blobs
20768 Alexandre Julliard (12):
20769 git.el: Keep the status buffer sorted by filename.
20770 git.el: Allow selecting whether to display uptodate/unknown/ignored files.
20771 git.el: Allow the add and remove commands to be applied to ignored files.
20772 git.el: Preserve file marks when doing a full refresh.
20773 git.el: Do not print a status message on every git command.
20774 git.el: Update a file status in the git buffer upon save.
20775 git.el: Reset the permission flags when changing a file state.
20776 git.el: Fix typo in "Reverted file" message.
20777 git.el: Fix typo in git-update-saved-file error handling.
20778 git.el: Refresh only the changed file marks when marking/unmarking all.
20779 git.el: Run git-gc --auto after commits.
20780 git.el: Added a menu for git-status-mode.
20782 Andreas Ericsson (1):
20783 Simplify strchrnul() compat code
20785 André Goddard Rosa (2):
20786 Print the real filename that we failed to open.
20787 Error out when user doesn't have access permission to the repository
20790 parse_date_format(): convert a format name to an enum date_mode
20791 Make for-each-ref allow atom names like "<name>:<something>"
20792 Make for-each-ref's grab_date() support per-atom formatting
20793 Add a test script for for-each-ref, including test of date formatting
20795 Andy Whitcroft (6):
20796 Teach send-pack a mirror mode
20797 git-push: plumb in --mirror mode
20798 Add tests for git push'es mirror mode
20799 git-push: add documentation for the newly added --mirror mode
20800 git-quiltimport.sh fix --patches handling
20801 git-svn: add support for pulling author from From: and Signed-off-by:
20803 Anton Gyllenberg (1):
20804 gitview: import only one of gtksourceview and gtksourceview2
20806 Ask Bjørn Hansen (1):
20807 send-email: Don't add To: recipients to the Cc: header
20809 Benoit Sigoure (7):
20810 git-svn: add a generic tree traversal to fetch SVN properties
20811 git-svn: implement git svn create-ignore
20812 git-svn: add git svn propget
20813 git-svn: add git svn proplist
20814 git-svn: simplify the handling of fatal errors
20815 core-tutorial: Catch up with current Git
20816 git-svn: sort the options in the --help message.
20818 Björn Steinbrink (1):
20819 git config: Don't rely on regexec() returning 1 on non-match
20821 Blake Ramsdell (1):
20822 transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
20825 git-gc: by default use safer "-A" option to repack when not --prune'ing
20826 git-gc --auto: simplify "repack" command line building
20829 Add a --dry-run option to git-send-pack.
20830 Add a --dry-run option to git-push.
20832 Brian Gernhardt (3):
20833 format-patch: Add configuration and off switch for --numbered
20834 format-patch: Test --[no-]numbered and format.numbered
20835 t3502: Disambiguate between file and rev by adding --
20837 Brian M. Carlson (1):
20838 git-gui: Reorder msgfmt command-line arguments
20841 Function for updating refs.
20842 Add tests for documented features of "git reset".
20843 Move make_cache_entry() from merge-recursive.c into read-cache.c
20844 Make "git reset" a builtin.
20845 Make builtin-tag.c use parse_options.
20847 Charles Bailey (1):
20848 Fix clone not to ignore depth when performing a local clone
20851 git-p4 support for perforce renames.
20852 git-p4: Add a helper function to parse the full git diff-tree output.
20853 git-p4: Detect changes to executable bit and include them in p4 submit.
20855 Christian Couder (27):
20856 rev-list --bisect: Move finding bisection into do_find_bisection.
20857 rev-list --bisect: Move some bisection code into best_bisection.
20858 rev-list --bisect: Bisection "distance" clean up.
20859 rev-list --bisect: Fix best == NULL case.
20860 Test suite: reset TERM to its previous value after testing.
20861 rev-list: implement --bisect-all
20862 rev-list documentation: add "--bisect-all".
20863 Bisect: fix some white spaces and empty lines breakages.
20864 Bisect: implement "bisect skip" to mark untestable revisions.
20865 Bisect: refactor "bisect_write_*" functions.
20866 Bisect: refactor some logging into "bisect_write".
20867 Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
20868 Bisect: add "bisect skip" to the documentation.
20869 Bisect: add a "bisect replay" test case.
20870 Bisect run: "skip" current commit if script exit code is 125.
20871 Bisect: add "skip" to the short usage string.
20872 Bisect reset: remove bisect refs that may have been packed.
20873 Bisect visualize: use "for-each-ref" to list all good refs.
20874 Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
20875 Bisect reset: do nothing when not bisecting.
20876 Documentation: add a new man page for "git-help"
20877 Trace and quote with argv: get rid of unneeded count argument.
20878 git-help: add -i|--info option to display info page.
20879 Documentation: describe -i/--info option to "git-help"
20880 git-help: add -w|--web option to display html man page in a browser.
20881 Use {web,instaweb,help}.browser config options.
20882 Documentation: describe -w/--web option to "git-help".
20884 Christian Stimming (14):
20885 Mark strings for translation.
20886 Makefile rules for translation catalog generation and installation.
20887 Add glossary that can be converted into a po file for each language.
20888 Add glossary translation template into git.
20889 German translation for git-gui
20890 German glossary for translation
20891 git-gui: Add more words to translation glossary
20892 git-gui: Update German glossary according to mailing list discussion
20893 git-gui: Incorporate glossary changes into existing German translation
20894 git-gui: Update German translation, including latest glossary changes
20895 git-gui: Add more terms to glossary.
20896 git-gui: Update German translation
20897 Update git-gui.pot with latest (few) string additions and changes.
20898 Update German translation. 100% completed.
20901 Remove outdated references to cogito in documentation
20903 Daniel Barkalow (23):
20904 Refactor http.h USE_CURL_MULTI fill_active_slots().
20905 Make function to refill http queue a callback
20906 Remove obsolete commit-walkers
20907 Modularize commit-walker
20908 Add uploadpack configuration info to remote.
20909 Report information on branches from remote.h
20910 Make fetch-pack a builtin with an internal API
20911 Push code for transport library
20912 Add matching and parsing for fetch-side refspec rules
20913 Add fetch methods to transport library.
20914 Make fetch a builtin
20915 Allow abbreviations in the first refspec to be merged
20916 Fix adding a submodule with a remote url
20917 Restore default verbosity for http fetches.
20918 Remove duplicate ref matches in fetch
20919 Correct handling of upload-pack in builtin-fetch-pack
20920 Miscellaneous const changes and utilities
20921 Build-in peek-remote, using transport infrastructure.
20922 Use built-in send-pack.
20923 Build-in send-pack, with an API for other programs to call.
20925 Use parseopts in builtin-push
20926 Add more checkout tests
20928 David D. Kilzer (8):
20929 git-svn log: fix ascending revision ranges
20930 git-svn log: include commit log for the smallest revision in a range
20931 git-svn log: handle unreachable revisions like "svn log"
20932 git-send-email: show all headers when sending mail
20933 git-svn: extract reusable code into utility functions
20934 git-svn info: implement info command
20935 git-svn: info --url [path]
20936 git-svn: Remove unnecessary Git::SVN::Util package
20939 diff-delta.c: pack the index structure
20940 diff-delta.c: Rationalize culling of hash buckets
20941 git-commit.sh: Shell script cleanup
20944 git-svn: Fix a typo and add a comma in an error message in git-svn
20947 gitweb: Provide title attributes for abbreviated author names.
20948 gitweb: Refactor abbreviation-with-title-attribute code.
20949 gitweb: Use chop_and_escape_str in more places.
20950 Rearrange git-format-patch synopsis to improve clarity.
20951 git-checkout: Support relative paths containing "..".
20952 git-checkout: Test for relative path use.
20953 Mention that git-rm can be an appropriate resolution as well as git-add.
20956 gitweb: the commitdiff is very commonly used, it's needed on search page, too
20958 Dmitry Potapov (1):
20959 preserve executable bits in zip archives
20961 Douglas Stockwell (1):
20962 send-email: Add support for SSL and SMTP-AUTH
20965 Fixed a command line option type for builtin-fsck.c
20966 git-stash: Fix listing stashes
20969 git-svn: support for funky branch and project names over HTTP(S)
20970 git-svn: add tests for command-line usage of init and clone commands
20971 t9106: fix a race condition that caused svn to miss modifications
20972 git-svn: allow `info' command to work offline
20973 git-svn: replace .rev_db with a more space-efficient .rev_map format
20974 git-svn: reinstate old rev_db optimization in new rev_map
20976 Eygene Ryabinkin (2):
20977 git-svn: respect Subversion's [auth] section configuration values
20978 git-svn: use "no warnings 'once'" to disable false-positives
20980 Eyvind Bernhardsen (1):
20981 Fix mis-markup of the -p, --patch option in git-add(1)
20983 Frederick Akalin (1):
20984 gtksourceview2 support for gitview
20987 No longer install git-svnimport, move to contrib/examples
20988 git-reset: add -q option to operate quietly
20989 contrib/hooks/post-receive-email: fix typo
20990 contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars
20991 contrib/hooks/post-receive-email: make subject prefix configurable
20992 hooks--update: fix test for properly set up project description file
20993 hooks--update: decline deleting tags or branches by default, add config options
20994 contrib/hooks/post-receive-email: remove cruft, $committer is not used
20995 Don't cache DESTDIR in perl/perl.mak.
20998 git-cvsimport: fix handling of user name when it is not set in CVSROOT
21001 Remove unreachable statements
21002 Use compat mkdtemp() on Solaris boxes
21004 Gustaf Hendeby (1):
21005 git-svn now reads settings even if called in subdirectory
21007 H.Merijn Brand (1):
21008 Do not rely on the exit status of "unset" for unset variables
21010 Harri Ilari Tapio Liusvaara (1):
21011 git-gui: Disambiguate "commit"
21014 git-clone: honor "--" to end argument parsing
21017 git-gui: initial version of russian translation
21019 J. Bruce Fields (3):
21020 git-rebase: support --whitespace=<option>
21021 git-rebase: fix -C option
21022 errors: "strict subset" -> "ancestor"
21024 Jakub Narebski (18):
21025 gitweb: Fix and simplify "split patch" detection
21026 gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
21027 gitweb: Add 'status_str' to parse_difftree_raw_line output
21028 gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
21029 gitweb: Easier adding/changing parameters to current URL
21030 gitweb: Use href(-replay=>1, page=>...) to generate pagination links
21031 gitweb: Use href(-replay=>1, action=>...) to generate alternate views
21032 gitweb: Add tests for overriding gitweb config with repo config
21033 gitweb: Read repo config using 'git config -z -l'
21034 gitweb: Use config file for repository description and URLs
21035 gitweb: Style all tables using CSS
21036 gitweb: Put project README in div.readme, fix its padding
21037 autoconf: Add tests for memmem, strtoumax and mkdtemp functions
21038 Add config_int() method to the Git perl module
21039 gitweb: Update and improve gitweb/README file
21040 contrib: Make remotes2config.sh script more robust
21041 autoconf: Add test for OLD_ICONV (squelching compiler warning)
21042 autoconf: Check asciidoc version to automatically set ASCIIDOC8
21045 remote: add 'rm' subcommand
21046 remote: document the 'rm' subcommand
21047 gc: use parse_options
21050 git-remote: exit with non-zero status after detecting error in "rm".
21051 On error, do not list all commands, but point to --help option
21054 contrib/fast-import: add perl version of simple example
21055 diffcore-rename: cache file deltas
21056 git-rebase: document suppression of duplicate commits
21057 send-pack: don't update tracking refs on error
21058 t5516: test update of local refs on push
21059 git-gc: improve wording of --auto notification
21060 Documentation/git-gc: explain --auto in description
21061 Documentation/git-gc: improve description of --auto
21062 more terse push output
21063 receive-pack: don't mention successful updates
21064 send-pack: require --verbose to show update of tracking refs
21065 git-ls-files: add --exclude-standard
21066 send-pack: track errors for each ref
21067 send-pack: check ref->status before updating tracking refs
21068 send-pack: assign remote errors to each ref
21069 make "find_ref_by_name" a public function
21070 send-pack: tighten remote error reporting
21071 send-pack: fix "everything up-to-date" message
21072 avoid "defined but not used" warning for fetch_objs_via_walker
21073 send-pack: cluster ref status reporting
21074 git-tag: test that -s implies an annotated tag
21075 Revert "t5516: test update of local refs on push"
21076 git-commit: clean up die messages
21077 Enable rewrite as well as rename detection in git-status
21078 quote_path: fix collapsing of relative paths
21079 t9600: require cvsps 2.1 to perform tests
21080 t7300: add test for clean with wildcard pathspec
21081 wt-status.c:quote_path(): convert empty path to "./"
21082 add status.relativePaths config variable
21083 git-status: documentation improvements
21084 don't mention index refreshing side effect in git-status docs
21085 Add git-browse-help to .gitignore
21086 Support GIT_PAGER_IN_USE environment variable
21087 git-svn: get color config from --get-colorbool
21088 shortlog: document -e option
21089 git-clone: print an error message when trying to clone empty repo
21091 Jeff Muizelaar (1):
21092 fix contrib/hooks/post-receive-email hooks.recipients error message
21095 hooks-pre-commit: use \t, rather than a literal TAB in regexp
21097 Johannes Schindelin (57):
21100 Teach "git remote" a mirror mode
21101 verify-tag: also grok CR/LFs in the tag signature
21102 apply: get rid of --index-info in favor of --build-fake-ancestor
21103 Move bundle specific stuff into bundle.[ch]
21104 Add bundle transport
21105 git-gui: Deiconify startup wizard so it raises to the top
21106 git-gui: add a simple msgfmt replacement
21107 rebase -i: commit when continuing after "edit"
21108 rebase -i: style fixes and minor cleanups
21109 rebase -i: Fix numbers in progress report
21110 rebase -i: avoid exporting GIT_AUTHOR_* variables
21111 rebase -i: work on a detached HEAD
21112 rebase -i: support single-letter abbreviations for the actions
21113 Introduce remove_dir_recursively()
21114 fetch/push: readd rsync support
21115 Support cvs via git-shell
21116 Fix compilation when NO_CURL is defined
21117 cvsexportcommit: get rid of temporary directory
21118 fetch: if not fetching from default remote, ignore default merge
21119 Deduce exec_path also from calls to git with a relative path
21120 Add tests for parse-options.c
21121 parse-options: Allow abbreviated options when unambiguous
21122 po2msg: ignore entries marked with "fuzzy"
21123 po2msg: ignore untranslated messages
21124 po2msg: actually output statistics
21125 git-reset: do not be confused if there is nothing to reset
21126 Split off the pretty print stuff into its own file
21127 parse-options: abbreviation engine fix.
21128 builtin-reset: do not call "ls-files --unmerged"
21129 builtin-reset: avoid forking "update-index --refresh"
21130 Deprecate git-lost-found
21131 rebase: operate on a detached HEAD
21132 builtin-blame: set up the work_tree before the first file access
21133 rebase: fix "rebase --continue" breakage
21134 Close files opened by lock_file() before unlinking.
21135 rebase -i: move help to end of todo file
21136 launch_editor(): read the file, even when EDITOR=:
21137 builtin-commit: fix reflog message generation
21138 git status: show relative paths when run in a subdirectory
21139 builtin-commit: fix --signoff
21140 builtin-commit --s: add a newline if the last line was not a S-o-b
21141 builtin-commit: resurrect behavior for multiple -m options
21142 builtin-commit: Add newline when showing which commit was created
21143 Replace "runstatus" with "status" in the tests
21144 filter-branch: fix dirty way to provide the helpers to commit filters
21145 git checkout's reflog: even when detaching the HEAD, say from where
21146 bash completion: add diff options
21147 Replace instances of export VAR=VAL with VAR=VAL; export VAR
21148 Teach 'git pull' about --rebase
21149 rebase -i: give rerere a chance
21150 receive-pack: allow deletion of corrupt refs
21151 Add "--expire <time>" option to 'git prune'
21152 Add 'git fast-export', the sister of 'git fast-import'
21153 fast-export: rename the signed tag mode 'ignore' to 'verbatim'
21154 Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0
21156 Johannes Sixt (38):
21157 git-gui: Change main window layout to support wider screens
21158 gitk: Do not pick up file names of "copy from" lines
21159 Change git_connect() to return a struct child_process instead of a pid_t.
21160 Use start_command() in git_connect() instead of explicit fork/exec.
21161 Use start_command() to run content filters instead of explicit fork/exec.
21162 Use run_command() to spawn external diff programs instead of fork/exec.
21163 Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
21164 Have start_command() create a pipe to read the stderr of the child.
21165 upload-pack: Use start_command() to run pack-objects in create_pack_file().
21166 Add infrastructure to run a function asynchronously.
21167 Use the asyncronous function infrastructure in builtin-fetch-pack.c.
21168 upload-pack: Move the revision walker into a separate function.
21169 upload-pack: Run rev-list in an asynchronous function.
21170 t0021-conversion.sh: Test that the clean filter really cleans content.
21171 Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
21172 Use the asyncronous function infrastructure to run the content filter.
21173 Fix an infinite loop in sq_quote_buf().
21174 upload-pack: Use finish_{command,async}() instead of waitpid().
21175 Give git-am back the ability to add Signed-off-by lines.
21176 git-clean: Fix error message if clean.requireForce is not set.
21177 Fix preprocessor logic that determines the availablity of strchrnul().
21178 t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
21179 t7501-commit.sh: Not all seds understand option -i
21180 t5302-pack-index: Skip tests of 64-bit offsets if necessary.
21181 Skip t3902-quoted.sh if the file system does not support funny names.
21182 Use is_absolute_path() in sha1_file.c.
21183 Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
21184 builtin run_command: do not exit with -1.
21185 Allow a relative builtin template directory.
21186 Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
21187 Allow ETC_GITCONFIG to be a relative path.
21188 refs.c: Remove unused get_ref_sha1()
21189 fetch-pack: Prepare for a side-band demultiplexer in a thread.
21190 Flush progress message buffer in display().
21191 git-gui: Improve the application icon on Windows.
21192 git-commit: Allow to amend a merge commit that does not change the tree
21193 for-each-ref: Fix quoting style constants.
21194 Fix a typo in checkout.sh and cleanup one-line help messages
21197 Update manpages to reflect new short and long option aliases
21198 Documentation: Fix references to deprecated commands
21200 Jonathan del Strother (2):
21201 Fixing path quoting in git-rebase
21202 gitk: Add support for OS X mouse wheel
21205 Add post-merge hook, related documentation, and tests.
21206 Added example hook script to save/restore permissions/ownership.
21207 post-checkout hook, tests, and docs
21208 Minor usage update in setgitperms.perl
21210 Junio C Hamano (157):
21211 Keep last used delta base in the delta window
21212 git-gui po/README: Guide to translators
21214 Implement git gc --auto
21215 Invoke "git gc --auto" from commit, merge, am and rebase.
21216 archive - leakfix for format_subst()
21217 git-commit: Allow partial commit of file removal.
21218 An additional test for "git-reset -- path"
21220 git-commit: partial commit of paths only removed from the index
21221 Document ls-files --with-tree=<tree-ish>
21222 builtin-pack-objects.c: avoid bogus gcc warnings
21223 stash: implement "stash create"
21224 rebase: allow starting from a dirty tree.
21225 Export matches_pack_name() and fix its return value
21226 pack-objects --keep-unreachable
21227 repack -A -d: use --keep-unreachable when repacking
21228 git-gc --auto: move threshold check to need_to_gc() function.
21229 git-gc --auto: add documentation.
21230 git-gc --auto: protect ourselves from accumulated cruft
21231 git-gc --auto: restructure the way "repack" command line is built.
21232 git-gc --auto: run "repack -A -d -l" as necessary.
21233 builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
21234 builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
21235 git-remote rm: add tests and minor fix-ups
21236 Start RelNotes for 1.5.4
21237 strbuf_setlen(): do not barf on setting length of an empty buffer to 0
21238 send-email --smtp-server-port: allow overriding the default port
21239 rerere: Fix use of an empty strbuf.buf
21240 git-am: make the output quieter.
21241 bundle transport: fix an alloc_ref() call
21242 Update stale documentation link in the k.org site
21243 git-am: fix typo in the previous one.
21244 dateformat: parse %(xxdate) %(yydate:format) correctly
21245 builtin-apply: fix conversion error in strbuf series
21246 Update state documentation link for 1.5.3.4
21247 k.org git toppage: Add link to 1.5.3 release notes.
21248 help: remove extra blank line after "See 'git --help'" message
21249 revert/cherry-pick: work on merge commits as well
21250 git-fetch: do not fail when remote branch disappears
21251 RelNotes-1.5.4: describe recent updates
21252 git-gui: Update Japanese strings (part 2)
21253 Revert "rebase: allow starting from a dirty tree."
21254 git-merge: no reason to use cpio anymore
21255 format-patch -s: add MIME encoding header if signer's name requires so
21256 cherry-pick/revert -m: add tests
21257 test format-patch -s: make sure MIME content type is shown as needed
21258 War on whitespace: first, a bit of retreat.
21259 git-diff: complain about >=8 consecutive spaces in initial indent
21260 core.whitespace: add test for diff whitespace error highlighting
21261 clean: require -f to do damage by default
21262 gc: --prune prunes unreferenced objects.
21263 scripts: Add placeholders for OPTIONS_SPEC
21264 git-rev-parse --parseopt
21265 git-sh-setup: fix parseopt `eval` string underquoting
21266 send-pack: segfault fix on forced push
21267 Style: place opening brace of a function definition at column 1
21268 git-am: -i does not take a string parameter.
21269 Update draft release notes for 1.5.4
21270 Documentation: lost-found is now deprecated.
21271 Make check-docs target detect removed commands
21272 Documentation: remove documentation for removed tools.
21273 git-commit: a bit more tests
21274 Resurrect git-revert.sh example and add comment to builtin-revert.c
21275 core.excludesfile clean-up
21276 Fix per-directory exclude handing for "git add"
21277 git-bisect: war on "sed"
21278 git-bisect: use update-ref to mark good/bad commits
21279 git-bisect: modernize branch shuffling hack
21280 Update draft release notes for 1.5.4
21281 Draft release notes: fix clean.requireForce description
21282 Update draft release notes for 1.5.4
21283 Move gitk to its own subdirectory
21284 git-clean: Fix error message if clean.requireForce is not set.
21285 git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a bit better
21286 Fix "quote" misconversion for rewrite diff output.
21287 Make test scripts executable.
21288 file_exists(): dangling symlinks do exist
21289 builtin-commit: do not color status output shown in the message template
21290 builtin-commit: run commit-msg hook with correct message file
21291 Export three helper functions from ls-files
21292 Fix add_files_to_cache() to take pathspec, not user specified list of files
21293 builtin-commit: fix partial-commit support
21294 Addendum to "MaintNotes"
21295 git-add -i: allow multiple selection in patch subcommand
21296 git-branch --contains=commit
21297 git-branch --contains: doc and test
21298 builtin-tag: accept and process multiple -m just like git-commit
21299 Add a few more tests for git-commit
21300 builtin-apply: rename "whitespace" variables and fix styles
21301 t4119: correct overeager war-on-whitespace
21302 builtin-apply: teach whitespace_rules
21303 core.whitespace: documentation updates.
21304 Deprecate peek-remote
21305 Update draft release notes for 1.5.4
21306 builtin-add: fix command line building to call interactive
21307 add -i: Fix running from a subdirectory
21308 "git-tag -s" should create a signed annotated tag
21309 revert/cherry-pick: do not mention the original ref
21310 "color.diff = true" is not "always" anymore.
21311 git-config --get-color: get configured color
21312 dir.c: minor clean-up
21313 per-directory-exclude: lazily read .gitignore files
21314 Update draft release notes for 1.5.4
21315 Resurrect peek-remote
21316 Consolidate command list to one.
21317 Update draft release notes for 1.5.4
21318 rename: Break filepairs with different types.
21319 git-am: catch missing author date early.
21320 Fix --signoff in builtin-commit differently.
21321 git-commit: Allow to amend a merge commit that does not change the tree
21322 git-commit --allow-empty
21323 git-commit --allow-empty
21324 git-commit documentation: fix unfinished sentence.
21325 Add git-fast-export to list of commands.
21326 Update draft release notes for 1.5.4
21327 Run the specified perl in Documentation/
21328 Formatting fix for Documentation/git-help.txt
21329 Documentation: rerere is enabled by default these days.
21330 Documentation/git.txt: typofix
21331 t5510: add a bit more tests for fetch
21332 git-cvsserver runs hooks/post-update
21333 Revert "git-am: catch missing author date early."
21334 Documentation: color.* = true means "auto"
21335 git config --get-colorbool
21336 Color support for "git-add -i"
21337 git-clean: Honor pathspec.
21338 config --get-colorbool: diff.color is a deprecated synonym to color.diff
21339 Use gitattributes to define per-path whitespace rule
21340 hg-to-git: handle an empty dir in hg.
21341 do not discard status in fetch_refs_via_pack()
21342 git-status documentation: mention subdirectory behaviour
21343 Update draft release notes to 1.5.4
21344 git-bisect visualize: work in non-windowed environments better
21345 mailmap: fix bogus for() loop that happened to be safe by accident
21346 shortlog: code restructuring and clean-up
21347 git-shortlog -e: show e-mail address as well
21348 ls-remote: resurrect pattern limit support
21349 Fix commit-msg hook to allow editing
21350 Re-fix "builtin-commit: fix --signoff"
21352 Update draft Release Notes for 1.5.4
21353 Documentation: add gitman.info target
21354 git-help -i: invoke info with document and node name
21355 git-help -i: show info documentation from matching version of git
21356 send-email: do not muck with initial-reply-to when unset.
21357 commit: do not add extra LF at the end of the summary.
21358 Support a merge with conflicting gitlink change
21359 blame: drop blob data after passing blame to the parent
21360 shortlog: default to HEAD when the standard input is a tty
21361 git-diff --numstat -z: make it machine readable
21362 disable t9119 for now.
21363 Documentation: rename git.texi to user-manual.texi
21364 git.spec.in: remove python_path
21365 git-help -w: do not require to be in git repository
21366 RPM spec: Adjust htmldir
21370 git-stash: Display help message if git-stash is run with wrong sub-commands
21373 Updated Russian translation.
21375 Konstantin V. Arkhipov (1):
21376 git-svn's dcommit must use subversion's config
21378 Kristian Høgsberg (18):
21379 Enable wt-status output to a given FILE pointer.
21380 Enable wt-status to run against non-standard index file.
21381 Add strbuf_read_file().
21382 Clean up stripspace a bit, use strbuf even more.
21383 Introduce entry point add_interactive and add_files_to_cache
21384 Export rerere() and launch_editor().
21385 Port builtin-add.c to use the new option parser.
21386 Add testcase for amending and fixing author in git commit.
21387 Export launch_editor() and make it accept ':' as a no-op editor.
21388 Port git commit to C.
21389 builtin-commit: Refresh cache after adding files.
21390 Call refresh_cache() when updating the user index for --only commits.
21391 builtin-commit: Clean up an unused variable and a debug fprintf().
21392 t7501-commit: Add test for git commit <file> with dirty index.
21393 builtin-commit: Include the diff in the commit message when verbose.
21394 Fix off-by-one error when truncating the diff out of the commit message.
21395 Use a strbuf for copying the command line for the reflog.
21396 Rewrite builtin-fetch option parsing to use parse_options().
21398 Kristof Provost (1):
21399 makefile: Add a cscope target
21402 git-svn: add support for --first-parent
21403 git-svn: always use --first-parent
21404 Add test-script for git-merge porcelain
21405 git-merge: fix faulty SQUASH_MSG
21406 git-merge: refactor option parsing
21407 git-merge: add support for branch.<name>.mergeoptions
21408 git-merge: add support for --commit and --no-squash
21409 git-merge: add --ff and --no-ff options
21410 Make merge-recursive honor diff.renamelimit
21411 Teach git-pull about --[no-]ff, --no-squash and --commit
21412 for-each-ref: fix setup of option-parsing for --sort
21415 Speedup scanning for excluded files.
21417 Linus Torvalds (18):
21418 optimize diffcore-delta by sorting hash entries.
21419 Add 'diffcore.h' to LIB_H
21420 Split out "exact content match" phase of rename detection
21421 Ref-count the filespecs used by diffcore
21422 copy vs rename detection: avoid unnecessary O(n*m) loops
21423 Do linear-time/space rename logic for exact renames
21424 Do exact rename detection regardless of rename limits
21425 Fix ugly magic special case in exact rename detection
21426 Do the fuzzy rename detection limits with the exact renames removed
21427 Simplify topo-sort logic
21428 Add "--early-output" log flag for interactive GUI use
21429 Enhance --early-output format
21430 revision walker: mini clean-up
21431 Fix rev-list when showing objects involving submodules
21432 Fix parent rewriting in --early-output
21433 Fix a pathological case in git detecting proper renames
21434 Fix a pathological case in git detecting proper renames
21435 "git tag -u keyname" broken
21438 gitweb: speed up project listing on large work trees by limiting find depth
21440 Marius Storm-Olsen (2):
21441 Add 'git-p4 commit' as an alias for 'git-p4 submit'
21442 Teach core.autocrlf to 'git blame'
21445 git-submodule - allow a relative path as the subproject url
21448 Move convert-objects to contrib.
21449 rebase -i: create .dotest-merge after validating options.
21451 Matthias Kestenholz (1):
21452 Documentation: add --patch option to synopsis of git-add
21454 Michael Gebetsroither (1):
21455 hg-to-git speedup through selectable repack intervals
21457 Michael W. Olson (2):
21458 git-rebase--interactive.sh: Quote arguments to test
21459 Documentation/git-tag.txt: Document how to backdate tags
21461 Michael Witten (2):
21462 git-cvsexportcommit.perl: git-apply no longer needs --binary
21463 git-cvsserver runs hooks/post-receive
21465 Michal Vitecek (1):
21466 Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
21468 Michele Ballabio (7):
21469 git-gui: remove dots in some UI strings
21470 git-gui: add some strings to translation
21471 git-gui: fix typo in lib/blame.tcl
21472 git-gui: update Italian translation
21473 test-lib.sh: move error line after error() declaration
21474 git-gui: fix a typo in lib/commit.tcl
21475 git-gui: update it.po and glossary/it.po
21478 instaweb: allow for use of auto-generated scripts
21479 instaweb: support for Ruby's WEBrick server
21482 Reuse previous annotation when overwriting a tag
21483 Add tests for git tag
21484 Refactor working tree setup
21485 Use setup_work_tree() in builtin-ls-files.c
21486 Don't always require working tree for git-rm
21487 Make git-blame fail when working tree is needed and we're not in one
21488 Small code readability improvement in show_reference() in builtin-tag.c
21489 Do git reset --hard HEAD when using git rebase --skip
21490 Fix and improve t7004 (git-tag tests)
21491 git-send-email.perl: Really add angle brackets to In-Reply-To if necessary
21492 Cleanup variables in http.[ch]
21493 Fix small memory leaks induced by diff_tree_setup_paths
21494 Fix XML parser leaks in http-push
21497 Hungarian translation of git-gui
21498 git-send-email: add a new sendemail.to configuration variable
21499 Include diff options in the git-log manpage
21500 Update Hungarian translation. 100% completed.
21502 Nanako Shiraishi (3):
21503 Japanese translation of git-gui
21504 git-gui: Update Japanese strings
21505 Update ja.po for git-gui
21507 Nguyễn Thái Ngọc Duy (3):
21508 contrib/fast-import: add simple shell example
21509 git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
21510 Remove repo version check from setup_git_directory
21512 Nicolas Pitre (42):
21513 straighten the list of objects to deltify
21514 localize window memory usage accounting
21515 rearrange delta search progress reporting
21516 basic threaded delta search
21517 threaded delta search: refine work allocation
21518 threaded delta search: better chunck split point
21519 threaded delta search: specify number of threads at run time
21520 fix threaded delta search locking
21521 threaded delta search: add pack.threads config variable
21522 threaded delta search: proper locking for cache accounting
21523 more compact progress display
21524 cope with multiple line breaks within sideband progress messages
21525 pack-objects: no delta possible with only one object in the list
21526 pack-objects.c: fix some global variable abuse and memory leaks
21527 fix const issues with some functions
21528 fix for more minor memory leaks
21529 prune-packed: don't call display_progress() for every file
21530 make struct progress an opaque type
21531 relax usage of the progress API
21532 add throughput to progress display
21533 add throughput display to index-pack
21534 add some copyright notice to the progress display code
21535 add throughput display to git-push
21536 return the prune-packed progress display to the inner loop
21537 make sure throughput display gets updated even if progress doesn't move
21538 Show total transferred as part of throughput progress
21539 make the pack index version configurable
21540 pack-objects: get rid of an ugly cast
21541 git-fetch: more terse fetch output
21542 fix display overlap between remote and local progress
21543 sideband.c: ESC is spelled '\033' not '\e' for portability.
21544 make display of total transferred more accurate
21545 remove dead code from the csum-file interface
21546 restore fetching with thin-pack capability
21547 make display of total transferred fully accurate
21548 nicer display of thin pack completion
21549 add a howto document about corrupted blob recovery
21550 rehabilitate some t5302 tests on 32-bit off_t machines
21551 pack-objects: fix delta cache size accounting
21552 pack-objects: reverse the delta search sort list
21553 pack-objects: fix threaded load balancing
21554 pack-objects: more threaded load balancing fix with often changed paths
21556 Paolo Ciarrocchi (1):
21557 Italian translation of git-gui
21560 git-stash: do not get fooled with "color.diff = true"
21561 Set OLD_ICONV on Cygwin.
21563 Paul Mackerras (37):
21564 gitk: Establish and use global left-to-right ordering for commits
21565 gitk: Improve the drawing of links to parent lines
21566 gitk: Eliminate diagonal arrows
21567 gitk: Get rid of idrowranges and rowrangelist
21568 gitk: Get rid of idinlist array
21569 gitk: Fix some problems with the display of ids as links
21570 gitk: Get rid of the rowchk array
21571 gitk: Do only the parts of the layout that are needed
21572 gitk: Fix bug causing incorrect ref list contents when switching view
21573 gitk: Fix bug causing undefined variable error when cherry-picking
21574 gitk: Add a cache for the topology info
21575 gitk: Make it possible to lay out all the rows we have received so far
21576 gitk: Fix bugs in setting rowfinal
21577 gitk: Get rid of lookingforhead, use commitinterest instead
21578 gitk: Fix bug in generating patches
21579 gitk: Simplify highlighting interface and combine with Find function
21580 gitk: Fix a couple of bugs
21581 gitk: Add progress bars for reading in stuff and for finding
21582 gitk: Fix the tab setting in the diff display window
21583 gitk: Fix bug causing Tcl error when changing find match type
21584 gitk: Use named fonts instead of the font specification
21585 gitk: Keep track of font attributes ourselves instead of using font actual
21586 gitk: Add a font chooser
21587 gitk: Fix bug where the last few commits would sometimes not be visible
21588 gitk: Get rid of the diffopts variable
21589 gitk: Fix Tcl error: can't unset findcurline
21590 gitk: Check that we are running on at least Tcl/Tk 8.4
21591 gitk: Avoid an error when cherry-picking if HEAD has moved on
21592 gitk: Fix "can't unset prevlines(...)" Tcl error
21593 gitk: Limit diff display to listed paths by default
21594 gitk: Ensure tabstop setting gets restored by Cancel button
21595 gitk: Integrate the reset progress bar in the main frame
21596 gitk: Use the status window for other functions
21597 gitk: Fix some bugs with path limiting in the diff display
21598 gitk: Fix a couple more bugs in the path limiting
21599 gitk: Simplify the code for finding commits
21600 gitk: Use the UI font for the diff/old version/new version radio buttons
21602 Pierre Habouzit (80):
21603 Rework strbuf API and semantics.
21604 Simplify strbuf uses in archive-tar.c using strbuf API
21605 fast-import: Use strbuf API, and simplify cmd_data()
21606 mktree: Simplify write_tree() using strbuf API
21607 Use strbuf API in apply, blame, commit-tree and diff
21608 Use strbuf API in buitin-rerere.c
21609 Use strbuf API in cache-tree.c
21610 Strbuf API extensions and fixes.
21611 Change semantics of interpolate to work like snprintf.
21612 Rework pretty_print_commit to use strbufs instead of custom buffers.
21613 Use strbuf_read in builtin-fetch-tool.c.
21614 Use strbufs to in read_message (imap-send.c), custom buffer--.
21615 Replace all read_fd use with strbuf_read, and get rid of it.
21616 New strbuf APIs: splice and attach.
21617 Rewrite convert_to_{git,working_tree} to use strbuf's.
21618 Now that cache.h needs strbuf.h, remove useless includes.
21619 builtin-apply: use strbuf's instead of buffer_desc's.
21620 Refactor replace_encoding_header.
21621 Remove preemptive allocations.
21622 Drop strbuf's 'eof' marker, and make read_line a first class citizen.
21623 fast-import was using dbuf's, replace them with strbuf's.
21624 fast-import optimization:
21625 Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
21626 Use xmemdupz() in many places.
21627 Fix the expansion pattern of the pseudo-static path buffer.
21628 nfv?asprintf are broken without va_copy, workaround them.
21629 strbuf API additions and enhancements.
21630 Rework unquote_c_style to work on a strbuf.
21631 Full rework of quote_c_style and write_name_quoted.
21632 sq_quote_argv and add_to_string rework with strbuf's.
21634 Make builtin-rerere use of strbuf nicer and more efficient.
21635 Small cache_tree_write refactor.
21636 double free in builtin-update-index.c
21637 strbuf change: be sure ->buf is never ever NULL.
21638 strbuf_read_file enhancement, and use it.
21639 Make read_patch_file work on a strbuf.
21640 Fix in-place editing functions in convert.c
21641 Add some fancy colors in the test library when terminal supports it.
21642 Support a --quiet option in the test-suite.
21643 fast-import.c: fix regression due to strbuf conversion
21644 Add a simple option parser.
21645 parse-options: be able to generate usages automatically
21646 parse-options: make some arguments optional, add callbacks.
21647 Add shortcuts for very often used options.
21648 parse-options: allow callbacks to take no arguments at all.
21649 Make builtin-rm.c use parse_options.
21650 Make builtin-mv.c use parse-options
21651 Make builtin-branch.c use parse_options.
21652 Make builtin-describe.c use parse_options
21653 Make builtin-revert.c use parse_options.
21654 Make builtin-update-ref.c use parse_options
21655 Make builtin-symbolic-ref.c use parse_options.
21656 Make builtin-for-each-ref.c use parse-opts.
21657 Make builtin-fsck.c use parse_options.
21658 Make builtin-count-objects.c use parse_options.
21659 Make builtin-name-rev.c use parse_options.
21660 Make builtin-pack-refs.c use parse_options.
21661 git-fetch: be even quieter.
21662 Some better parse-options documentation.
21663 Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
21664 Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
21665 Migrate git-clean.sh to use git-rev-parse --parseopt.
21666 Migrate git-clone to use git-rev-parse --parseopt
21667 Migrate git-am.sh to use git-rev-parse --parseopt
21668 Migrate git-merge.sh to use git-rev-parse --parseopt
21669 Migrate git-instaweb.sh to use git-rev-parse --parseopt
21670 Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
21671 Migrate git-quiltimport.sh to use git-rev-parse --parseopt
21672 Migrate git-repack.sh to use git-rev-parse --parseopt
21673 sh-setup: don't let eval output to be shell-expanded.
21674 parse-options new features.
21675 Use OPT_SET_INT and OPT_BIT in builtin-branch
21676 Use OPT_BIT in builtin-for-each-ref
21677 Use OPT_BIT in builtin-pack-refs
21678 Make the diff_options bitfields be an unsigned with explicit masks.
21679 Reorder diff_opt_parse options more logically per topics.
21680 parse-options: Allow to hide options from the default usage.
21681 builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
21682 Invert numbers and names in the git-shortlog summary mode.
21685 Open external merge tool with original file extensions for all three files
21687 Ralf Wildenhues (10):
21688 manual: Fix or remove em dashes.
21689 Fix some typos, punctuation, missing words, minor markup.
21690 Fix wording in push definition.
21691 manual: Fix example finding commits referencing given content.
21692 manual: add some markup.
21693 manual: use 'URL' instead of 'url'.
21694 git-cherry-pick: improve description of -x.
21695 Fix minor nits in configure.ac
21696 git-bisect.sh: Fix sed script to work with AIX and BSD sed.
21697 Document all help keys in "git add -i" patch mode.
21700 Export format_commit_message()
21701 archive: specfile support (--pretty=format: in archive files)
21702 Remove unused function convert_sha1_file()
21704 archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
21705 archive: rename attribute specfile to export-subst
21706 archive: fix subst file generation
21707 Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
21709 --pretty=format: on-demand format expansion
21710 --pretty=format: parse commit message only once
21711 add strbuf_adddup()
21712 --format=pretty: avoid calculating expensive expansions twice
21715 Define NO_MEMMEM of FreeBSD as it lacks the function
21717 Robert Schiele (2):
21718 git-gui: install-sh from automake does not like -m755
21719 install-sh from automake does not like -m without delimiting space
21721 Robin Rosenberg (1):
21722 cvsexportcommit: Add switch to specify CVS workdir
21725 git-svn: fix test for trunk svn (commit message not needed)
21726 git-svn: fix test for trunk svn (transaction out of date)
21727 git-svn: handle changed svn command-line syntax
21728 gitk: disable colours when calling git log
21729 Allow HTTP proxy to be overridden in config
21730 Add remote.<name>.proxy
21732 Scott R Parish (7):
21733 "git" returns 1; "git help" and "git help -a" return 0
21734 remove unused/unneeded "pattern" argument of list_commands
21735 "current_exec_path" is a misleading name, use "argv_exec_path"
21736 list_commands(): simplify code by using chdir()
21737 use only the $PATH for exec'ing git commands
21738 include $PATH in generating list of commands for "help -a"
21739 shell should call the new setup_path() to setup $PATH
21741 Sergei Organov (7):
21742 core-tutorial.txt: Fix git-show-branch example and its description
21743 user-manual.txt: fix a few mistakes
21744 user-manual: minor rewording for clarity.
21745 Documentation: customize diff-options depending on particular command
21746 user-manual.txt: minor clarification.
21747 Documentation: fix git-clone manpage not to refer to itself
21748 Let git-help prefer man-pages installed with this version of git
21751 Add more tests for git-clean
21752 Make git-clean a builtin
21753 Teach git clean to use setup_standard_excludes()
21754 Make git status usage say git status instead of git commit
21756 Shawn O. Pearce (106):
21757 git-gui: Locate the library directory early during startup
21758 git-gui: Initialize Tcl's msgcat library for internationalization
21759 git-gui: Update po/README as symlink process is not necessary
21760 git-gui: Correct stock message for 'Invalid font specified in %s'
21761 git-gui: Quiet the msgfmt part of the make process
21762 git-gui: Ensure msgfmt failure stops GNU make
21763 Define NO_MEMMEM on Darwin as it lacks the function
21764 git-gui: Mark revision chooser tooltip for translation
21765 git-gui: Localize commit/author dates when displaying them
21766 git-gui: Support context-sensitive i18n
21767 git-gui: Document the new i18n context support
21768 git-gui: Make the tree browser also use lightgray selection
21769 git-gui: Paper bag fix missing translated strings
21770 Correct builtin-fetch to handle + in refspecs
21771 Fix off by one bug in reflog messages written by builtin-fetch
21772 Remove unnecessary debugging from builtin-fetch
21773 Remove unused unpacklimit variable from builtin-fetch
21774 Replace custom memory growth allocator with ALLOC_GROW
21775 Simplify fetch transport API to just one function
21776 Refactor index-pack "keep $sha1" handling for reuse
21777 Remove pack.keep after ref updates in git-fetch
21778 Always ensure the pack.keep file is removed by git-fetch
21779 Fix builtin-fetch memory corruption by not overstepping array
21780 Backup the array passed to fetch_pack so we can free items
21781 Properly cleanup in http_cleanup so builtin-fetch does not segfault
21782 Don't bother passing ref log details to walker in builtin-fetch
21783 Cleanup duplicate initialization code in transport_get
21784 Add transport.h to LIB_H as transport.o is in LIB_OBJS
21785 Remove unnecessary 'fetch' argument from transport_get API
21786 Allow builtin-fetch to work on a detached HEAD
21787 Don't configure remote "." to fetch everything to itself
21788 Remove more debugging from builtin-fetch
21789 builtin-fetch: Don't segfault on "fetch +foo"
21790 Don't attempt to merge non-existant remotes in t5515
21791 Correct handling of branch.$name.merge in builtin-fetch
21792 Avoid printing unnecessary warnings during fetch and push
21793 Use 'unsigned:1' when we mean boolean options
21794 Rename remote.uri to remote.url within remote handling internals
21795 Refactor struct transport_ops inlined into struct transport
21796 Always obtain fetch-pack arguments from struct fetch_pack_args
21797 Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
21798 Fix memory leaks when disconnecting transport instances
21799 git-gui: Fix missing i18n markup in push/fetch windows
21800 git-gui: Support native Win32 Tcl/Tk under Cygwin
21801 git-gui: Refactor some UI init to occur earlier
21802 git-gui: Allow users to choose/create/clone a repository
21803 git-gui: Avoid console scrollbars unless they are necessary
21804 git-gui: Don't bother showing OS error message about hardlinks
21805 git-gui: Keep the UI responsive while counting objects in clone
21806 git-gui: Copy objects/info/alternates during standard clone
21807 Cleanup style nit of 'x == NULL' in remote.c
21808 Cleanup unnecessary break in remote.c
21809 Prevent send-pack from segfaulting when a branch doesn't match
21810 git-gui: Don't delete console window namespaces too early
21811 git-gui: Don't delete scrollbars in console windows
21812 git-gui: Switch the git-gui logo to Henrik Nyh's logo
21813 git-gui: Make the status bar easier to read in the setup wizard
21814 git-gui: Use Henrik Nyh's git logo icon on Windows systems
21815 git-gui: Support a native Mac OS X application bundle
21816 git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
21817 git-gui: Allow forced push into remote repository
21818 git-gui: Refactor Henrik Nyh's logo into its own procedure
21819 git-gui: Refactor about dialog code into its own module
21820 git-gui: Include our Git logo in the about dialog
21821 git-gui: Use progress meter in the status bar during index updates
21822 git-gui: Consolidate the Fetch and Push menus into a Remote menu
21823 git-gui: Bind Cmd-, to Preferences on Mac OS X
21824 git-gui: Shorten the staged/unstaged changes title bar text
21825 git-gui: Updated po strings based on current sources
21826 git-gui: Move load_config procedure below git-version selection
21827 git-gui: Refactor git-config --list parsing
21828 git-gui: Support LFs embedded in config file values
21829 git-gui: Change repository browser radio buttons to hyperlinks
21830 git-gui: Offer repository management features in menu bar
21831 git-gui: Fix bind errors when switching repository chooser panels
21832 git-gui: Disable the text widget in the repository chooser
21833 git-gui: Bind n/c/o accelerators in repository chooser
21834 git-gui: Ensure copyright message is correctly read as UTF-8
21835 git-gui: Use proper Windows shortcuts instead of bat files
21836 git-gui: Support cloning Cygwin based work-dirs
21837 git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
21838 git-gui: Honor a config.mak in git-gui's top level
21839 Fix 'push --all branch...' error handling
21840 Support 'push --dry-run' for rsync transport
21841 Support 'push --dry-run' for http transport
21842 git-gui: Paper bag fix the global config parsing
21843 Change 'Deltifying objects' to 'Compressing objects'
21844 Teach prune-packed to use the standard progress meter
21845 Stop displaying "Pack pack-$ID created." during git-gc
21846 Avoid scary errors about tagged trees/blobs during git-fetch
21847 Define compat version of mkdtemp for systems lacking it
21848 Improved const correctness for strings
21849 Use PRIuMAX instead of 'unsigned long long' in show-index
21850 git-gui: Make sure we get errors from git-update-index
21851 git-gui: Protect against bad translation strings
21852 git-gui: Allow users to set font weights to bold
21853 Reteach builtin-ls-remote to understand remotes
21854 git-gui: Bind Meta-T for "Stage To Commit" menu action
21855 git-fetch: Always fetch tags if the object they reference exists
21856 run-command: Support sending stderr to /dev/null
21857 rev-list: Introduce --quiet to avoid /dev/null redirects
21858 git-fetch: avoid local fetching from alternate (again)
21859 Handle broken vsnprintf implementations in strbuf
21860 Fix warning about bitfield in struct ref
21862 Remove git-status from list of scripts as it is builtin
21864 Shun Kei Leung (1):
21865 git-p4: Fix typo in --detect-labels
21867 Simon Hausmann (10):
21868 git-p4: Always call 'p4 sync ...' before submitting to Perforce.
21869 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
21870 git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
21871 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
21872 git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
21873 git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
21874 git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
21875 git-p4: Added support for automatically importing newly appearing perforce branches.
21876 git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
21877 git-p4: Fix direct import from perforce after fetching changes through git from origin
21880 Make mailsplit and mailinfo strip whitespace from the start of the input
21882 Stefan Sperling (1):
21883 Fix pool handling in git-svnimport to avoid memory leaks.
21885 Steffen Prohaska (16):
21886 git-gui: add directory git-gui is located in to PATH (on Windows)
21887 git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
21888 git-gui: add mingw specific startup wrapper
21889 git-gui: offer a list of recent repositories on startup
21890 mergetool: use path to mergetool in config var mergetool.<tool>.path
21891 mergetool: add support for ECMerge
21892 mergetool: avoid misleading message "Resetting to default..."
21893 Fix comment in strbuf.h to use correct name strbuf_avail()
21894 push: mention --verbose option in documentation
21895 push: teach push to pass --verbose option to transport layer
21896 push: support pushing HEAD to real branch name
21897 add refname_match()
21898 push: use same rules as git-rev-parse to resolve refspecs
21899 refactor fetch's ref matching to use refname_match()
21900 Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
21901 sha1_file.c: Fix size_t related printf format warnings
21904 Add a message explaining that automatic GC is about to start
21905 builtin-fetch: Add "-q" as a synonym for "--quiet"
21906 git-svn: Don't create a "master" branch every time rebase is run
21909 Don't checkout the full tree if avoidable
21912 Make the list of common commands more exclusive
21913 Remove hint to use "git help -a"
21915 Thomas Harning (1):
21916 git-merge-ours: make it a builtin.
21918 Uwe Kleine-König (1):
21919 send-email: apply --suppress-from to S-o-b and cc-cmd
21922 git-svn: add a show-externals command.
21925 Added a test for fetching remote tags when there is not tags.
21927 Wincent Colaiuta (21):
21928 Further clarify clean.requireForce changes
21929 Authenticate only once in git-send-email
21930 Refactor patch_update_cmd
21931 Teach builtin-add to pass multiple paths to git-add--interactive
21932 Add path-limiting to git-add--interactive
21933 Add "--patch" option to git-add--interactive
21934 Fix typo in draft 1.5.4 release notes
21935 Highlight keyboard shortcuts in git-add--interactive
21936 revert/cherry-pick: Allow overriding the help text by the calling Porcelain
21937 add -i: allow prefix highlighting for "Add untracked" as well.
21938 git-add -i: add help text for list-and-choose UI
21939 Silence iconv warnings on Leopard
21940 Teach "git add -i" to colorize whitespace errors
21941 Allow --no-verify to bypass commit-msg hook
21942 Documentation: fix --no-verify documentation for "git commit"
21943 Add tests for pre-commit and commit-msg hooks
21944 Interactive editor tests for commit-msg hook
21945 Style fixes for pre-commit hook tests
21946 Use "whitespace" consistently
21947 Documentation: minor grammar fix for "git apply"
21948 Fix "diff --check" whitespace detection
21951 Initial Chinese translation for git-gui
21952 git-gui: Added initial version of po/glossary/zh_cn.po
21955 gitweb: use Perl built-in utf8 function for UTF-8 decoding.
21958 Version v1.5.3.8; changes since v1.5.3.7:
21959 -----------------------------------------
21962 Change from using email.com to example.com as example domain, as per RFC 2606.
21965 git-svn: support for funky branch and project names over HTTP(S)
21966 git-svn: clarify the "Ignoring error from SVN" piece
21969 t9600: test cvsimport from CVS working tree
21970 clone: correctly report http_fetch errors
21971 git-send-email: avoid duplicate message-ids
21974 config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
21976 Junio C Hamano (3):
21977 git grep shows the same hit repeatedly for unmerged paths
21978 git-am -i: report rewritten title
21981 Nguyễn Thái Ngọc Duy (3):
21982 Add missing inside_work_tree setting in setup_git_directory_gently
21983 Do check_repository_format() early
21984 Do check_repository_format() early (re-fix)
21987 Version v1.5.3.7; changes since v1.5.3.6:
21988 -----------------------------------------
21990 Björn Steinbrink (3):
21991 git-commit.sh: Fix usage checks regarding paths given when they do not make sense
21992 t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
21993 git-commit: Add tests for invalid usage of -a/--interactive with paths
21996 config: correct core.loosecompression documentation
21997 config: clarify compression defaults
21999 J. Bruce Fields (7):
22000 git-remote.txt: fix example url
22001 user-manual: mention "..." in "Generating diffs", etc.
22002 Documentation: Fix references to deprecated commands
22003 user-manual: define "branch" and "working tree" at start
22004 user-manual: failed push to public repository
22005 user-manual: clarify language about "modifying" old commits
22006 user-manual: recovering from corruption
22009 Improve description of git-branch -d and -D in man page.
22012 send-email: add transfer encoding header with content-type
22013 Add basic cvsimport tests
22014 cvsimport: use rev-parse to support packed refs
22015 cvsimport: miscellaneous packed-ref fixes
22016 cvsimport: fix usage of cvsimport.module
22018 Johannes Schindelin (2):
22019 bundle create: keep symbolic refs' names instead of resolving them
22020 Replace the word 'update-cache' by 'update-index' everywhere
22023 t7003-filter-branch: Fix test of a failing --msg-filter.
22025 Junio C Hamano (11):
22026 format-patch -s: add MIME encoding header if signer's name requires so
22027 test format-patch -s: make sure MIME content type is shown as needed
22028 ce_match_stat, run_diff_files: use symbolic constants for readability
22029 git-add: make the entry stat-clean after re-adding the same contents
22030 t2200: test more cases of "add -u"
22031 Make test scripts executable.
22032 Fix sample pre-commit hook
22033 git-checkout: describe detached head correctly
22034 scripts: do not get confused with HEAD in work tree
22035 Fix typo in t4008 test title
22038 Linus Torvalds (1):
22039 Fix rev-list when showing objects involving submodules
22042 Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
22045 Make GIT_INDEX_FILE apply to git-commit
22047 Steffen Prohaska (1):
22048 user-manual: Add section "Why bisecting merge commits can be harder ..."
22051 Version v1.5.3.6; changes since v1.5.3.5:
22052 -----------------------------------------
22055 stop t1400 hiding errors in tests
22057 Ask Bjørn Hansen (1):
22058 When exec() fails include the failing command in the error message
22060 Benoit Sigoure (2):
22061 git-send-email: Change the prompt for the subject of the initial message.
22062 git-svn: prevent dcommitting if the index is dirty.
22065 cvsexportcommit: fix for commits that do not have parents
22067 Christian Couder (1):
22068 for-each-ref: fix off by one read.
22070 David D. Kilzer (2):
22071 RelNotes-1.5.3.5: fix typo
22072 RelNotes-1.5.3.5: fix another typo
22075 Improve accuracy of check for presence of deflateBound.
22078 git-svn: fix dcommit clobbering when committing a series of diffs
22079 git-svn: t9114: verify merge commit message in test
22082 git-diff.txt: add section "output format" describing the diff formats
22083 git-cvsimport: really convert underscores in branch names to dots with -u
22084 git-daemon: fix remote port number in log entry
22085 git-mailsplit: with maildirs not only process cur/, but also new/
22087 Jakub Narebski (1):
22088 gitweb: Update config file example for snapshot feature in gitweb/INSTALL
22091 git-branch: remove mention of non-existent '-b' option
22092 git-send-email: add charset header if we add encoded 'From'
22095 replace reference to git-rm with git-reset in git-commit doc
22097 Johannes Schindelin (1):
22098 Add Documentation/CodingGuidelines
22101 Remove escaping of '|' in manpage option sections
22102 instaweb: Minor cleanups and fixes for potential problems
22103 Documentation: Fix man page breakage with DocBook XSL v1.72
22105 Jonathan del Strother (1):
22106 Fixing path quoting in git-rebase
22108 Junio C Hamano (12):
22109 grep with unmerged index
22110 refresh_index_quietly(): express "optional" nature of index writing better
22111 Makefile: add missing dependency on wt-status.h
22112 Start preparing for 1.5.3.6
22113 t/t3404: fix test for a bogus todo file.
22114 revert/cherry-pick: allow starting from dirty work tree.
22115 git-clean: honor core.excludesfile
22116 core.excludesfile clean-up
22117 Fix per-directory exclude handing for "git add"
22118 Update draft release notes for 1.5.3.6
22119 grep -An -Bm: fix invocation of external grep command
22122 Kristian Høgsberg (1):
22123 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
22125 Marco Costalba (1):
22126 Remove a couple of duplicated include
22129 Delay pager setup in git blame
22132 print warning/error/fatal messages in one shot
22133 git-hash-object should honor config variables
22134 fix index-pack with packs >4GB containing deltas on 32-bit machines
22136 Ralf Wildenhues (3):
22137 git-clone.txt: Improve --depth description.
22138 Avoid a few unportable, needlessly nested "...`...".
22139 Fix sed string regex escaping in module_name.
22141 Sergei Organov (6):
22142 git-filter-branch.txt: fix a typo.
22143 git-format-patch.txt: fix explanation of an example.
22144 Documentation: quote commit messages consistently.
22145 SubmittingPatches: improve the 'Patch:' section of the checklist
22146 core-tutorial.txt: Fix argument mistake in an example.
22147 git-remote.txt: fix typo
22149 Shawn O. Pearce (2):
22150 Fix memory leak in traverse_commit_list
22151 Don't allow fast-import tree delta chains to exceed maximum depth
22153 Vincent Zanotti (1):
22154 gitweb: correct month in date display for atom feeds
22156 Wincent Colaiuta (2):
22157 Grammar fixes for gitattributes documentation
22158 Fix t9101 test failure caused by Subversion "auto-props"
22161 Version v1.5.3.5; changes since v1.5.3.4:
22162 -----------------------------------------
22165 Ensure we add directories in the correct order
22168 Fix generation of perl/perl.mak
22170 Andrew Clausen (1):
22171 helpful error message when send-pack finds no refs in common.
22173 Aurelien Bompard (1):
22174 honor the http.sslVerify option in shell scripts
22176 Benoit Sigoure (1):
22177 Fix a small memory leak in builtin-add
22179 Björn Steinbrink (3):
22180 Fix --strategy parsing in git-rebase--interactive.sh
22181 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
22182 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
22184 Brian Gernhardt (1):
22185 cvsserver: Use exit 1 instead of die when req_Root fails.
22187 Frank Lichtenheld (1):
22188 git-config: don't silently ignore options after --list
22191 git-config: handle --file option with relative pathname properly
22192 git-config: print error message if the config file cannot be read
22194 Jean-Luc Herren (2):
22195 git add -i: Fix parsing of abbreviated hunk headers
22196 git add -i: Remove unused variables
22199 send-pack: respect '+' on wildcard refspecs
22201 Joakim Tjernlund (1):
22202 Improve receive-pack error message about funny ref creation
22204 Johannes Schindelin (5):
22205 clear_commit_marks(): avoid deep recursion
22206 rebase -i: use diff plumbing instead of porcelain
22207 Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
22208 fix filter-branch documentation
22209 filter-branch: update current branch when rewritten
22211 Julian Phillips (1):
22212 fast-import: Fix argument order to die in file_change_m
22214 Junio C Hamano (8):
22215 git-remote: fix "Use of uninitialized value in string ne"
22216 sha1_file.c: avoid gcc signed overflow warnings
22217 merge-recursive.c: mrtree in merge() is not used before set
22218 RelNotes-1.5.3.5: describe recent fixes
22219 Prevent send-pack from segfaulting (backport from 'master')
22220 git-merge: document but discourage the historical syntax
22221 Update GIT 1.5.3.5 Release Notes
22225 Make merge-recursive honor diff.renamelimit
22227 Linus Torvalds (6):
22228 Fix embarrassing "git log --follow" bug
22229 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
22230 git-blame shouldn't crash if run in an unmerged tree
22231 Avoid scary errors about tagged trees/blobs during git-fetch
22232 Fix directory scanner to correctly ignore files without d_type
22233 Fix diffcore-break total breakage
22235 Mathias Megyei (1):
22236 Do not remove distributed configure script
22238 Michael W. Olson (1):
22239 Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
22241 Michele Ballabio (2):
22242 git-reflog: document --verbose
22243 git-archive: document --exec
22246 cherry-pick/revert: more compact user direction message
22248 Patrick Welche (1):
22249 Define NI_MAXSERV if not defined by operating system
22251 Ralf Wildenhues (1):
22252 gitk.txt: Fix markup.
22254 Robert Schiele (1):
22255 fixing output of non-fast-forward output of post-receive-email
22257 Sergei Organov (1):
22258 core-tutorial: Use new syntax for git-merge.
22260 Shawn O. Pearce (17):
22261 git-gui: Display message box when we cannot find git in $PATH
22262 git-gui: Handle starting on mapped shares under Cygwin
22263 git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
22264 git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
22265 git-gui: Don't crash when starting gitk from a browser session
22266 Whip post 1.5.3.4 maintenance series into shape.
22267 Correct typos in release notes for 1.5.3.5
22268 Avoid 'expr index' on Mac OS X as it isn't supported
22269 Document additional 1.5.3.5 fixes in release notes
22270 Yet more 1.5.3.5 fixes mentioned in release notes
22271 Avoid invoking diff drivers during git-stash
22272 Further 1.5.3.5 fixes described in release notes
22273 Paper bag fix diff invocation in 'git stash show'
22274 git-gui: Correctly report failures from git-write-tree
22275 git-gui: Handle progress bars from newer gits
22276 git-gui: Don't display CR within console windows
22277 Describe more 1.5.3.5 fixes in release notes
22280 git-gui: Avoid using bold text in entire gui for some fonts
22282 Steffen Prohaska (2):
22283 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
22284 attr: fix segfault in gitattributes parsing code
22287 Version v1.5.3.4; changes since v1.5.3.3:
22288 -----------------------------------------
22291 post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
22294 Add test case for ls-files --with-tree
22296 Federico Mena Quintero (4):
22297 Say when --track is useful in the git-checkout docs.
22298 Add documentation for --track and --no-track to the git-branch docs.
22299 Note that git-branch will not automatically checkout the new branch
22300 Make git-pull complain and give advice when there is nothing to merge with
22303 git-remote: exit with non-zero status after detecting errors.
22305 Jean-Luc Herren (2):
22306 git-add--interactive: Allow Ctrl-D to exit
22307 git-add--interactive: Improve behavior on bogus input
22310 diffcore-rename: cache file deltas
22313 Mention 'cpio' dependency in INSTALL
22315 Johannes Schindelin (2):
22316 rebase -i: squash should retain the authorship of the _first_ commit
22317 Fix typo in config.txt
22319 Junio C Hamano (5):
22320 Whip post 1.5.3.3 maintenance series into shape.
22321 git-commit: initialize TMP_INDEX just to be sure.
22322 for-each-ref: fix %(numparent) and %(parent)
22323 rename diff_free_filespec_data_large() to diff_free_filespec_blob()
22327 Must not modify the_index.cache as it may be passed to realloc at some point.
22330 git stash: document apply's --index switch
22332 Robert Schiele (1):
22333 the ar tool is called gar on some systems
22335 Steffen Prohaska (1):
22336 fixed link in documentation of diff-options
22339 Version v1.5.3.3; changes since v1.5.3.2:
22340 -----------------------------------------
22343 Move make_cache_entry() from merge-recursive.c into read-cache.c
22346 quiltimport: Skip non-existent patches
22349 Detect exec bit in more cases.
22352 Supplant the "while case ... break ;; esac" idiom
22355 git-svn: don't attempt to spawn pager if we don't want one
22358 Fixed minor typo in t/t9001-send-email.sh test command line.
22360 J. Bruce Fields (1):
22361 user-manual: don't assume refs are stored under .git/refs
22363 Jakub Narebski (2):
22364 gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
22365 gitweb: No difftree output for trivial merge
22368 unexpected Make output (e.g. from --debug) causes build failure
22369 Do not over-quote the -f envelopesender value.
22371 Johannes Schindelin (1):
22372 apply: get rid of --index-info in favor of --build-fake-ancestor
22375 gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
22376 gitattributes.txt: Be more to the point in the filter driver description.
22378 Junio C Hamano (3):
22379 Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
22380 Mergetool generating blank files (1.5.3)
22383 Linus Torvalds (1):
22384 Fix revision log diff setup, avoid unnecessary diff generation
22387 Move the paragraph specifying where the .idx and .pack files should be
22388 Conjugate "search" correctly in the git-prune-packed man page.
22391 user-manual: Explain what submodules are good for.
22394 User Manual: add a chapter for submodules
22395 git-bundle: fix commandline examples in the manpage
22398 core-tutorial: correct URL
22401 Fix spelling of overridden in documentation
22404 mergetool: fix emerge when running in a subdirectory
22405 mergetool: Fix typo in options passed to kdiff3
22408 Version v1.5.3.2; changes since v1.5.3.1:
22409 -----------------------------------------
22411 Alexandre Julliard (1):
22412 hooks--update: Explicitly check for all zeros for a deleted ref.
22414 Benoit Sigoure (1):
22415 Add test to check recent fix to "git add -u"
22418 git-tag -s must fail if gpg cannot sign the tag.
22421 git-send-email.perl: Add angle brackets to In-Reply-To if necessary
22423 Dmitry V. Levin (2):
22424 Makefile: Add cache-tree.h to the headers list
22425 git-commit: Disallow amend if it is going to produce an empty non-merge commit
22428 git-svn: fix "Malformed network data" with svn:// servers
22429 git-svn: understand grafts when doing dcommit
22430 Documentation/git-svn: updated design philosophy notes
22433 git-gui: lib/index.tcl: handle files with % in the filename properly
22434 git-clone: improve error message if curl program is missing or not executable
22436 J. Bruce Fields (13):
22437 user-manual: adjust section levels in "git internals"
22438 user-manual: move object format details to hacking-git chapter
22439 user-manual: rename "git internals" to "git concepts"
22440 user-manual: create new "low-level git operations" chapter
22441 user-manual: rewrite index discussion
22442 user-manual: reorder commit, blob, tree discussion
22443 user-manual: rewrite object database discussion
22444 user-manual: move packfile and dangling object discussion
22445 user-manual: fix introduction to packfiles
22446 user-manual: todo updates and cleanup
22447 documentation: replace Discussion section by link to user-manual chapter
22448 core-tutorial: minor cleanup
22449 git-apply: fix whitespace stripping
22452 Documentation/git-archive.txt: a couple of clarifications.
22454 Jean-Luc Herren (1):
22455 stash: end index commit log with a newline
22458 git-push: documentation and tests for pushing only branches
22460 Johannes Schindelin (2):
22461 revision walker: --cherry-pick is a limited operation
22462 apply --index-info: fall back to current index for mode changes
22464 Junio C Hamano (13):
22465 git-apply: do not read past the end of buffer
22466 git-add -u: do not barf on type changes
22467 git-format-patch --in-reply-to: accept <message@id> with angle brackets
22468 diff --no-index: do not forget to run diff_setup_done()
22469 Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
22470 Split grep arguments in a way that does not requires to add /dev/null.
22471 git-sh-setup: typofix in comments
22472 send-email: make message-id generation a bit more robust
22473 git-commit: Allow partial commit of file removal.
22474 git-commit: partial commit of paths only removed from the index
22475 Document ls-files --with-tree=<tree-ish>
22476 t/t4014: test "am -3" with mode-only change.
22479 Linus Torvalds (1):
22480 Fix the rename detection limit checking
22482 Matthias Urlichs (1):
22483 git-svnimport: Use separate arguments in the pipe for git-rev-parse
22486 (cvs|svn)import: Ask git-tag to overwrite old tags.
22488 Michele Ballabio (2):
22489 git-gui: show unstaged symlinks in diff viewer
22490 git-gui: handle "deleted symlink" diff marker
22493 Documentation / grammer nit
22496 fix doc for --compression argument to pack-objects
22498 Pierre Habouzit (1):
22499 Fix lapsus in builtin-apply.c
22501 Ramsay Allan Jones (1):
22502 Fix a test failure (t9500-*.sh) on cygwin
22504 Shawn O. Pearce (17):
22505 git-gui: Correct starting of git-remote to handle -w option
22506 git-gui: Fix detaching current branch during checkout
22507 git-gui: Properly set the state of "Stage/Unstage Hunk" action
22508 Don't allow contrib/workdir/git-new-workdir to trash existing dirs
22509 Cleanup unnecessary file modifications in t1400-update-ref
22510 Include a git-push example for creating a remote branch
22511 git-gui: Disable Tk send in all git-gui sessions
22512 git-gui: Avoid use of libdir in Makefile
22513 git-gui: Assume untracked directories are Git submodules
22514 git-gui: Trim trailing slashes from untracked submodule names
22515 Make --no-thin the default in git-push to save server resources
22516 git-gui: Don't delete send on Windows as it doesn't exist
22517 git-gui: Make backporting changes from i18n version easier
22518 git-gui: Font chooser to handle a large number of font families
22519 git-gui: Provide 'uninstall' Makefile target to undo an installation
22520 git-gui: Paper bag fix "Commit->Revert" format arguments
22521 git-gui: Disable native platform text selection in "lists"
22523 Sven Verdoolaege (1):
22524 git-diff: don't squelch the new SHA1 in submodule diffs
22526 Ulrik Sverdrup (1):
22527 Remove duplicate note about removing commits with git-filter-branch
22530 Fixed update-hook example allow-users format.
22533 Version v1.5.3.1; changes since v1.5.3:
22534 ---------------------------------------
22536 Junio C Hamano (2):
22537 Typofix: 1.5.3 release notes
22538 GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
22541 Version v1.5.3; changes since v1.5.3-rc7:
22542 -----------------------------------------
22545 Temporary fix for stack smashing in mailinfo
22548 git-tag: Fix -l option to use better shell style globs.
22551 git-svn: fix dcommit clobbering upstream when committing multiple changes
22553 Giuseppe Bilotta (2):
22554 git-filter-branch: more detailed USAGE
22555 git-filter-branch: document --original option
22558 git-send-email --cc-cmd
22560 Johannes Schindelin (5):
22561 completion: also complete git-log's --left-right and --cherry-pick option
22562 filter-branch: fix remnants of old syntax in documentation
22563 rebase -i: mention the option to split commits in the man page
22564 filter-branch: provide the convenience functions also for commit filters
22565 filter-branch: introduce convenience function "skip_commit"
22568 rebase -m: Fix incorrect short-logs of already applied commits.
22570 Junio C Hamano (13):
22571 git-daemon(1): assorted improvements.
22572 ls-files --error-unmatch: do not barf if the same pattern is given twice.
22573 Makefile: do not allow gnu make to remove test-*.o files
22574 filter-branch: make sure orig_namespace ends with a single slash.
22575 git-init: autodetect core.symlinks
22576 Make "git-log --" without paths behave the same as "git-log" without --
22577 Hopefully the final update to draft release notes for 1.5.3.
22578 git-svn: Protect against "diff.color = true".
22579 git-diff: resurrect the traditional empty "diff --git" behaviour
22580 Avoid one-or-more (\+) non BRE in sed scripts.
22581 Documentation: minor AsciiDoc mark-up fixes.
22582 Update my contact address as the maintainer.
22586 URL: allow port specification in ssh:// URLs
22589 Make git-archimport log entries more consistent
22592 fix same sized delta logic
22594 Paul Mackerras (1):
22595 gitk: Fix bug causing undefined variable error when cherry-picking
22597 Robin Rosenberg (1):
22598 Mention -m as an abbreviation for --merge
22600 Shawn O. Pearce (1):
22601 Teach bash about completing arguments for git-tag
22604 Fixing comment in merge strategies
22607 Version v1.5.3-rc7; changes since v1.5.3-rc6:
22608 ---------------------------------------------
22611 Fix git-remote for ActiveState Perl
22613 Alexandre Julliard (1):
22614 git.el: Avoid a lisp error when there's no current branch (detached HEAD).
22617 Documentation: For consistency, use CVS instead of cvs.
22618 Documentation: Correct various misspellings and typos.
22619 Make usage documentation for git-am consistent.
22620 Make usage documentation for git-add consistent.
22621 When nothing to git-commit, honor the git-status color setting.
22624 diff-delta.c: Fix broken skip calculation.
22625 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
22626 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
22627 git-svn.txt: fix an obvious misspelling.
22630 git.el: Added colors for dark background
22633 git-svn: update documentation with CAVEATS section
22634 git-svn: dcommit prints out the URL to be committed to
22636 J. Bruce Fields (5):
22637 user-manual: edit "ignoring files" for conciseness
22638 user-manual: minor editing for conciseness
22639 user-manual: introduce the word "commit" earlier
22640 user-manual: use pithier example commit
22641 user-manual: fix incorrect header level
22643 Jakub Narebski (1):
22644 gitweb: Fix escaping HTML of project owner in 'projects_list' and 'summary' views
22647 git-tag(1): Remove duplicate text
22649 Johannes Schindelin (2):
22650 rebase -i: fix squashing corner case
22651 name-rev: Fix non-shortest description
22653 Junio C Hamano (11):
22654 blame: check return value from read_sha1_file()
22655 pack-objects: check return value from read_sha1_file()
22656 RelNotes draft for 1.5.3 update.
22657 Fix initialization of a bare repository
22658 git --bare cmd: do not unconditionally nuke GIT_DIR
22659 git-merge: do up-to-date check also for all strategies
22660 Porcelain level "log" family should recurse when diffing.
22661 "format-patch --root rev" is the way to show everything.
22662 Documentation/git-diff: A..B and A...B cannot take tree-ishes
22663 format-patch documentation: reword to hint "--root <one-commit>" more clearly
22666 Linus Torvalds (1):
22667 Fix racy-git handling in git-write-tree.
22670 Describe two-dot and three-dot notation for diff endpoints.
22673 gitweb: Fix searchbox positioning
22674 gitweb: Lift any characters restriction on searched strings
22675 git-add: Make the "tried to add ignored file" error message less confusing
22676 git-add: Make the filename globbing note a bit clearer
22679 Fix breakage in git-rev-list.txt
22682 Documentation: update tar.umask default
22684 Sean Estabrooks (1):
22685 Reset terminal attributes when terminating git send-email
22687 Shawn O. Pearce (13):
22688 git-gui: Fix window manager problems on ion3
22689 git-gui: Allow git-merge to use branch names in conflict markers
22690 git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
22691 git-gui: Fix "unoptimized loading" to not cause git-gui to crash
22692 Fix new-workdir (again) to work on bare repositories
22693 Suggest unsetting core.bare when using new-workdir on a bare repository
22694 Update bash completion with new 1.5.3 command line options
22695 Teach bash to complete ref arguments to git-describe
22696 Teach bash about git-submodule and its subcommands
22697 git-gui: Refactor diff pane popup support for future improvements
22698 git-gui: Do not offer to stage three-way diff hunks into the index
22699 git-gui: Correct 'git gui blame' in a subdirectory
22700 Don't segfault if we failed to inflate a packed delta
22702 Simon Hausmann (2):
22703 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
22704 git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
22706 Stefan Sperling (1):
22707 Document -u option in git-svnimport man page
22709 martin f. krafft (2):
22710 git-svn init/clone --stdlayout option to default-init trunk/tags/branches
22711 Install man3 manpages to $PREFIX/share/man/man3 even for site installs
22714 Version v1.5.3-rc6; changes since v1.5.3-rc5:
22715 ---------------------------------------------
22718 Fix whitespace in "Format of STDIN stream" of fast-import
22719 Avoid using va_copy in fast-import: it seems to be unportable.
22721 Arjen Laarhoven (2):
22722 gitk: Make the date/time display configurable
22723 t1301-shared-repo.sh: fix 'stat' portability issue
22726 Clarify actual behavior of 'git add' and ignored files
22728 Brian Gernhardt (1):
22729 Minor clarifications to git-filter-branch usage and doc
22732 Fix misspelling of 'suppress' in docs
22735 git-svn: fix log with single revision against a non-HEAD branch
22738 gitk: Handle 'copy from' and 'copy to' in diff headers.
22740 Junio C Hamano (10):
22741 Fix "git add -u" data corruption.
22743 Fix read-tree merging more than 3 trees using 3-way merge
22744 Update documentation links for older releases.
22745 git-clone: allow --bare clone
22746 Documentation/git-rebase: fix an example
22747 Clean-up read-tree error condition.
22748 fast-import pull request
22749 git clone: do not issue warning while cloning locally across filesystems
22753 git-submodule: re-enable 'status' as the default subcommand
22755 Linus Torvalds (2):
22756 Make thin-pack generation subproject aware.
22757 Take binary diffs into account for "git rebase"
22759 Lukas Sandström (1):
22760 Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
22763 git-completion.bash - add support for git-bundle
22766 Add and document a global --no-pager option for git.
22769 Clarify commit-tree documentation
22772 pack-objects: remove bogus arguments to delta_cacheable()
22774 Paul Mackerras (3):
22775 gitk: Fix warning when removing a branch
22776 gitk: Fix bug in fix for warning when removing a branch
22777 gitk: Add a window to list branches, tags and other references
22780 path-list.c: always free strdup'ed paths
22782 Salikh Zakirov (1):
22783 git-add -u paths... now works from subdirectory
22785 Sean Estabrooks (1):
22786 Fix small typo in git send-email man page.
22788 Shawn O. Pearce (11):
22789 git-gui: Avoid Tcl error in popup menu on diff viewer
22790 Actually allow TAG_FIXUP branches in fast-import
22791 Use handy ALLOC_GROW macro in fast-import when possible
22792 Teach fast-import to ignore lines starting with '#'
22793 Make trailing LF following fast-import `data` commands optional
22794 Make trailing LF optional for all fast-import commands
22795 Allow frontends to bidirectionally communicate with fast-import
22796 Generate crash reports on die in fast-import
22797 Include recent command history in fast-import crash reports
22798 Correct documentation of 'reflog show' to explain it shows HEAD
22799 Don't allow combination of -g and --reverse as it doesn't work
22801 Steffen Prohaska (1):
22802 gitk: Let user easily specify lines of context in diff view
22805 Document what the stage numbers in the :$n:path syntax mean.
22807 Sven Verdoolaege (1):
22808 git-apply: apply submodule changes
22811 git-gui: Added support for OS X right click
22814 Version v1.5.3-rc5; changes since v1.5.3-rc4:
22815 ---------------------------------------------
22818 Documentation/git-svn: how to clone a git-svn-created repository
22820 Alberto Bertogli (1):
22821 Allow git-svnimport to take "" as the trunk directory.
22824 Fix filehandle leak in "git branch -D"
22825 gitk: Continue and show error message in new repos
22826 gitk: Show an error and exit if no .git could be found
22828 Alexandre Julliard (3):
22829 git.el: Add support for interactive diffs.
22830 git.el: Always set the current directory in the git-diff buffer.
22831 git-add: Add support for --refresh option.
22834 cvsserver: Fix for work trees
22835 Add read_cache to builtin-check-attr
22837 Brian Gernhardt (1):
22838 Fix t5701-clone-local for white space from wc
22841 Make git tag a builtin.
22842 builtin-tag.c: Fix two memory leaks and minor notation changes.
22843 Make verify-tag a builtin.
22846 Documentation/git-commit.txt: correct bad list formatting.
22847 Add support for an info version of the user manual
22848 INSTALL: explain info installation and dependencies.
22849 Documentation/Makefile: remove cmd-list.made before redirecting to it.
22850 git-sh-setup.sh: make GIT_DIR absolute
22851 Add a test for git-commit being confused by relative GIT_DIR
22854 git-am: initialize variable $resume on startup
22856 J. Bruce Fields (4):
22857 user-manual: update for new default --track behavior
22858 user-manual: mention git-gui
22859 documentation: use the word "index" in the git-add manual page
22860 documentation: use the word "index" in the git-commit man page
22862 Jakub Narebski (1):
22863 gitweb: Fix handling of $file_name in feed generation
22865 Johannes Schindelin (4):
22866 launch_editor(): Heed GIT_EDITOR and core.editor settings
22867 Teach "git stripspace" the --strip-comments option
22868 checkout-index needs a working tree
22869 Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
22871 Junio C Hamano (24):
22872 git-clone: aggressively optimize local clone behaviour.
22873 git-completion: add "git stash"
22874 INSTALL: add warning on docbook-xsl 1.72 and 1.73
22875 unpack-trees.c: assume submodules are clean during check-out
22876 Fix install-doc-quick target
22877 user-manual: mention git stash
22878 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
22879 pager: find out pager setting from configuration
22880 Fix "make GZ=1 quick-install-doc"
22881 Reorder the list of commands in the manual.
22882 Fix formatting of git-blame documentation.
22883 Fix an illustration in git-rev-parse.txt
22884 tweak manpage formatting
22885 Revert "tweak manpage formatting"
22886 Optimize "diff --cached" performance.
22887 allow git-bundle to create bottomless bundle
22888 allow git-bundle to create bottomless bundle
22889 t3404: fix "fake-editor"
22890 builtin-bundle create - use lock_file
22891 git-diff: squelch "empty" diffs
22892 merge-recursive: do not rudely die on binary merge
22893 attr.c: refactoring
22894 attr.c: read .gitattributes from index as well.
22897 Jyotirmoy Bhattacharya (1):
22898 Fixed git-push manpage
22900 Linus Torvalds (8):
22901 connect: accept file:// URL scheme
22902 apply: remove directory that becomes empty by renaming the last file away
22903 Start moving unpack-trees to "struct tree_desc"
22904 Fix "git commit directory/" performance anomaly
22905 Move old index entry removal from "unpack_trees()" into the individual functions
22906 Optimize the common cases of git-read-tree
22907 Optimize the two-way merge of git-read-tree too
22908 Optimize the three-way merge of git-read-tree
22910 Luiz Fernando N. Capitulino (3):
22911 Avoid ambiguous error message if pack.idx header is wrong
22912 Introduces xmkstemp()
22913 Use xmkstemp() instead of mkstemp()
22915 Marco Costalba (1):
22916 Add --log-size to git log to print message size
22919 builtin-bundle.c - use stream buffered input for rev-list
22920 builtin-bundle - use buffered reads for bundle header
22921 gitk: Enable selected patch text on Windows
22922 gitk: Handle MouseWheel events on Windows
22923 t3902 - skip test if file system doesn't support HT in names
22925 Paul Mackerras (4):
22926 gitk: Add a context menu for file list entries
22927 gitk: Fix bug causing the "can't unset idinlist(...)" error
22928 gitk: Fix bug introduced in commit 67a4f1a7
22929 gitk: Fix bug causing Tcl error when updating graph
22931 Randal L. Schwartz (1):
22932 add "test-absolute-path" to .gitignore
22935 git-p4: Fix the sorting of changelists when cloning a Perforce repository.
22938 diff: don't run pager if user asked for a diff style exit code
22939 diff: squelch empty diffs even more
22941 Shawn O. Pearce (4):
22942 Document GIT_SSH environment variable alongside other variables
22943 Teach update-paranoid how to store ACLs organized by groups
22944 Teach the update-paranoid to look at file differences
22945 Use the empty tree for base diff in paranoid-update on new branches
22947 Simon Hausmann (2):
22948 git-p4: Fix support for symlinks.
22949 git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
22951 Steffen Prohaska (1):
22952 Improved hint on how to set identity
22955 git-stash documentation: stash numbering starts at zero, not one
22956 git-stash documentation: add missing backtick
22959 Add a note about the index being updated by git-status in some cases
22961 Uwe Kleine-König (3):
22962 send-email: teach sanitize_address to do rfc2047 quoting
22963 send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
22964 send-email: get all the quoting of realnames right
22967 Version v1.5.3-rc4; changes since v1.5.3-rc3:
22968 ---------------------------------------------
22971 Add an option to specify a file to config builtin
22972 Add a test for git-config --file
22973 Make verse of git-config manpage more readable
22974 Hack git-add--interactive to make it work with ActiveState Perl
22976 Alexandre Julliard (2):
22977 git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
22978 git.el: Take into account the core.excludesfile config option.
22980 Bradford C. Smith (2):
22981 fully resolve symlinks when creating lockfiles
22982 use lockfile.c routines in git_commit_set_multivar()
22984 Brian Gernhardt (1):
22985 Document commit.template configuration variable.
22987 Christian Couder (1):
22988 rev-list --bisect: fix allocation of "int*" instead of "int".
22990 Christian Stimming (1):
22991 git-gui: Unify wording to say "to stage" instead of "to add"
22994 Makefile: use $(FIND) instead of find
22995 git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
22996 When generating manpages, delete outdated targets first.
22998 David Soria Parra (1):
22999 Documentation/gitattributes.txt: typofix
23002 Fix documentation for core.gitproxy to reflect code
23004 Han-Wen Nienhuys (2):
23005 Sort output of "p4 change" in incremental import before further
23006 Fix style nit in Python slicing.
23008 Jakub Narebski (3):
23009 gitweb: Show submodule entries in the 'tree' view
23010 gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
23011 gitweb: Allow for multivalued parameters passed to href subroutine
23014 Documentation/git-diff: remove -r from --name-status example
23015 git-diff: turn on recursion by default
23018 --base-path-relaxed option
23020 Johannes Schindelin (11):
23021 rebase -i: fix overzealous output redirection
23022 rebase -i: fix interrupted squashing
23023 white space fixes in setup.c
23024 Add is_absolute_path() and make_absolute_path()
23025 Add functions get_relative_cwd() and is_inside_dir()
23026 Add set_git_dir() function
23027 Clean up work-tree handling
23028 get_relative_cwd(): clarify why it handles dir == NULL
23029 rebase -i: ignore patches that are already in the upstream
23030 rebase -i: fix for optional [branch] parameter
23031 read-tree: remove unnecessary call to setup_git_directory()
23033 Julian Phillips (1):
23034 git-gui: Handle git versions of the form n.n.n.GIT
23036 Junio C Hamano (23):
23037 Make sure git-stash works from subdirectory.
23038 gitweb: fix broken snapshot
23039 git-submodule module_name: avoid using unwieldy "value_regexp" feature.
23040 git-submodule: remove redundant call to git-describe
23041 When locking in a symlinked repository, try to lock the original.
23042 git_mkstemp(): be careful not to overflow the path buffer.
23043 Update description of -z option.
23044 git-stash: do not remove a ref by hand.
23045 Add test for symlinked configuration file updates.
23046 Fix git-stash apply --index
23047 git-stash apply --index: optimize postprocessing
23048 log_ref_write() -- do not chomp reflog message at the first LF
23049 symbolic-ref, update-ref: do not refuse reflog message with LF
23050 rebase: try not to munge commit log message
23051 add_file_to_index: skip rehashing if the cached stat already matches
23052 Unset GIT_EDITOR while running tests.
23053 git.c: execution path
23054 git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
23055 RelNotes 1.5.3 updates before -rc4
23056 Fix work-tree related breakages
23057 gitweb: do not choke on recursive symlink
23058 Fix bogus use of printf in t3700 test
23061 Kristian Høgsberg (1):
23062 Add test case for basic commit functionality.
23065 gitk: Ignore ctrl-z as EOF on windows
23067 Nanako Shiraishi (1):
23068 git-stash: Make sure reflog is created for refs/stash
23070 Nguyễn Thái Ngọc Duy (1):
23071 git-write-tree should not crash if prefix does not exist
23073 Paul Mackerras (4):
23074 gitk: Show changes in index and changes in working directory separately
23075 gitk: Make the fake commit for the index changes green rather than magenta
23076 gitk: Wait for the window to become visible after creating it
23077 gitk: Fix bugs in the Find function
23080 git-svn: Translate invalid characters in refname
23082 Robert Schiele (2):
23083 add option to find zlib in custom path
23084 make the name of the library directory a config option
23086 Robin Rosenberg (1):
23087 Document --unified/-U option
23090 Rename git-rebase interactive buffer: todo => git-rebase-todo
23092 Shawn O. Pearce (49):
23093 git-gui: Skip -dirty suffix on core git versions
23094 git-gui: Brown paper bag "dirty git version fix"
23095 git-gui: Always disable the Tcl EOF character when reading
23096 git-gui: Delay searching for 'nice' until its really asked for
23097 git-gui: Don't crash in ask_popup if we haven't mapped main window yet
23098 git-gui: Change our initial GC hint to be an estimate
23099 git-gui: Let the user continue even if we cannot understand git version
23100 git-gui: Delay the GC hint until after we are running
23101 git-gui: Move feature option selection before GIT_DIR init
23102 git-gui: Allow blame/browser subcommands on bare repositories
23103 git-gui: Allow browser subcommand to start in subdirectory
23104 git-gui: Allow users to browse any branch, not just the current one
23105 git-gui: Clarify the visualize history menu options
23106 git-gui: Increase the default height of the revision picker
23107 git-gui: Convert merge dialog to use class system
23108 Don't offer my special Tools/Migrate hack unless in multicommit
23109 git-gui: Bind Ctrl/Cmd-M to merge action
23110 git-gui: Avoid unnecessary global statements when possible
23111 git-gui: Translate standard encoding names to Tcl ones
23112 git-gui: Don't show blame tooltips that we have no data for
23113 git-gui: Completely remove support for creating octopus merges
23114 git-gui: Automatically backup the user's commit buffer
23115 git-gui: Save the merge base during checkout_op processing
23116 git-gui: Factor out common fast-forward merge case
23117 git-gui: Simplify error case for unsupported merge types
23118 git-gui: Skip unnecessary read-tree work during checkout
23119 git-gui: Internally allow fetch without storing for future pull support
23120 git-gui: Completely remove my Tools/Migrate hack
23121 git-gui: Fix unnecessary fast-forward during checkout
23122 gitk: Bind keyboard actions to the command key on Mac OS
23123 git-gui: Clarify meaning of add tracked menu option
23124 git-gui: Paper bag fix quitting crash after commit
23125 git-gui: Refactor diff popup into a procedure to ease i18n work
23126 git-gui: Refactor current branch menu items to make i18n easier
23127 git-gui: Avoid unnecessary symbolic-ref call during checkout
23128 git-gui: Save remote urls obtained from config/remotes setup
23129 git-gui: Display commit/tag/remote info in tooltip of revision picker
23130 git-gui: Show ref last update times in revision chooser tooltips
23131 git-gui: Replace merge dialog with our revision picker widget
23132 git-gui: Cleanup bindings within merge dialog
23133 git-gui: Format tracking branch merges as though they were pulls
23134 git-gui: Remove usernames from absolute SSH urls during merging
23135 git-gui: Don't kill modified commit message buffer with merge templates
23136 git-gui: Honor core.excludesfile when listing extra files
23137 git-gui: Use progress bar while resetting/aborting files
23138 git-gui: Make sure remotes are loaded when picking revisions
23139 git-gui: Don't offer to stage hunks from untracked files
23140 git-gui: Use more modern looking icons in the tree browser
23141 git-gui: Minor refactoring of merge command line in merge support
23143 Simon Hausmann (1):
23144 git-p4: Fix p4 user cache population on Windows.
23147 Try to be consistent with capitalization in the documentation
23149 Thomas Schwinge (2):
23150 Don't rely on unspecified behavior
23151 Support building on GNU/Hurd
23154 Version v1.5.3-rc3; changes since v1.5.3-rc2:
23155 ---------------------------------------------
23158 Add GIT_EDITOR environment and core.editor configuration variables
23160 Alexandre Julliard (2):
23161 git.el: Support for incremental status updates.
23162 git.el: Pass an explicit argument to enable smerge-mode.
23165 Rename read_pipe() with read_fd() and make its buffer nul-terminated.
23168 contrib/emacs/Makefile: Also install .el files.
23169 Documentation/gitignore.txt: Fix the seriously misleading priority explanation
23172 git-svn: fix commiting renames over DAV with funky file names
23174 Francis Moreau (1):
23175 Fix git-branch documentation when using remote refs
23177 Jakub Narebski (3):
23178 gitweb cleanup: Move @diff_opts declaration earlier
23179 gitweb: Fix support for legacy gitweb config for snapshots
23180 gitweb: More detailed error messages for snapshot format
23183 pretty-options.txt: tiny doc fix
23185 Johannes Schindelin (11):
23186 filter-branch: get rid of "set -e"
23187 rebase -i: call editor just once for a multi-squash
23188 fsck --lost-found: write blob's contents, not their SHA-1
23189 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
23190 Shut "git rebase -i" up when no --verbose was given
23191 rebase -i: exchange all "if [ .. ]" by "if test .."
23192 filter-branch: Big syntax change; support rewriting multiple refs
23193 Teach revision machinery about --no-walk
23194 git log -g: Complain, but do not fail, when no reflogs are there
23195 Teach approxidate() to understand "never"
23196 git am: skip pine's internal folder data
23198 Julian Phillips (1):
23199 Force listingblocks to be monospaced in manpages
23201 Junio C Hamano (8):
23203 Do not expect unlink(2) to fail on a directory.
23204 Fix VISUAL/EDITOR preference order in Documentation/config.txt.
23205 Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
23206 Mark user-manual as UTF-8
23207 user-manual: fix typolets.
23208 t9200: Be careful when checking CVS/Entries
23212 send-email: Update regex parsing for pine aliases
23214 Linus Torvalds (2):
23215 Do a better job at guessing unknown character sets
23216 Fix up duplicate parents removal
23218 Marco Costalba (1):
23219 Avoid to duplicate commit message when is not encoded
23221 Matt McCutchen (1):
23222 gitweb: snapshot cleanups & support for offering multiple formats
23224 Nanako Shiraishi (1):
23225 Document "git stash message..."
23228 filter-branch: fix dash complaining about "Missing '))'"
23229 cleanup unpack-trees.c: shrink struct tree_entry_list
23232 git-svn: Minimalistic patch which allows svn usernames with space(s).
23234 Robin Rosenberg (1):
23235 cvsexportcommit: avoid racy CVS problem.
23238 git-p4: use subprocess in p4CmdList
23239 git-p4: input to "p4 files" by stdin instead of arguments
23241 Simon Hausmann (3):
23242 git-p4: Cleanup, make listExistingP4Branches a global function for later use.
23243 git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
23244 git-p4: Cleanup, used common function for listing imported p4 branches
23247 Document how to tell git to not launch a pager
23248 Teach git-commit about commit message templates.
23250 Sven Verdoolaege (1):
23251 unpack-trees.c: assume submodules are clean during check-out
23254 Version v1.5.3-rc2; changes since v1.5.3-rc1:
23255 ---------------------------------------------
23258 Fix git-rebase -i to allow squashing of fast-forwardable commits
23261 Use $(RM) in Makefiles instead of 'rm -f'
23264 git-svn: remove leading slashes from fetch lines in the generate config
23267 make git-send-email.perl handle email addresses with no names when Email::Valid is present
23269 Jakub Narebski (3):
23270 Update git-merge documentation.
23271 Document long options '--message=<msg>' and '--no-commit'
23272 Document git commit --untracked-files and --verbose
23275 git-cvsserver: detect/diagnose write failure, etc.
23278 Remove useless uses of cat, and replace with filename arguments
23280 Junio C Hamano (7):
23281 Make show_rfc2822_date() just another date output format.
23282 Wire new date formats to --date=<format> parser.
23283 Document new --date=<format>
23284 Add contrib/stats/mailmap.pl script
23286 Documentation/git-commit-tree: remove description of a nonexistent limitation
23289 Marius Storm-Olsen (1):
23290 Fix git-p4 on Windows to not use the Posix sysconf function.
23293 More permissive "git-rm --cached" behavior without -f.
23296 Pack-objects: properly initialize the depth value
23298 Paul Mackerras (1):
23299 gitk: Fix bug introduced by previous commit
23301 Peter Hagervall (1):
23302 Make every builtin-*.c file #include "builtin.h"
23304 Robin Rosenberg (1):
23305 Support output ISO 8601 format dates
23307 Sean Estabrooks (3):
23308 Remove "WITH_P4IMPORT" knob from the Makefile
23309 Remove p4 rpm from git.spec.in.
23310 Demote git-p4import to contrib status.
23312 Shawn O. Pearce (2):
23313 Correct trivial typo in fast-import documentation
23314 Teach fast-import to recursively copy files/directories
23316 Stephen Rothwell (1):
23317 send-email: discard blank around address in extract_valid_address as well.
23319 Sven Verdoolaege (1):
23320 lockfile.c: schedule remove_lock_file only once.
23323 Version v1.5.3-rc1; changes since v1.5.3-rc0:
23324 ---------------------------------------------
23327 fix remote.origin.url in tutorial.txt
23330 Handle missing prefix for "Subject:" as if no prefix given
23331 Handle format.subjectprefix for every command which accepts --pretty
23332 Fix t5516 to create test repo without hooks
23333 Add -v|--verbose to git remote to show remote url
23336 Remove USE_PAGER from git-pickaxe and git-annotate
23337 Add urls.txt to git-clone man page
23340 user-manual: grammar and style fixes
23342 Brian Downing (10):
23343 pack-objects: Prefer shallower deltas if the size is equal
23344 gitk: Fix for tree view ending in nested directories
23345 Pack information tool
23346 Correct shebang line for contrib/stats/packinfo.pl
23347 Don't try to delta if target is much smaller than source
23348 Support fetching the memory usage of a delta index
23349 Add functions for parsing integers with size suffixes
23350 Add pack-objects window memory usage limit
23351 Add --window-memory option to git-repack
23352 Add documentation for --window-memory, pack.windowMemory
23354 Brian Gernhardt (1):
23355 Add core.pager config variable.
23357 CJ van den Berg (1):
23358 git-submodule: Fix two instances of the same typo
23361 t7004: Skip tests for signed tags in an old version of gpg.
23362 t0030: Remove repeated instructions and add missing &&
23363 t0030: Add tests with consecutive text lines and others with spaces added.
23364 t7004: Add tests for the git tag -n option.
23365 Function stripspace now gets a buffer instead file descriptors.
23367 Daniel Barkalow (2):
23368 Add allocation and freeing functions for struct refs
23369 Some cosmetic changes to remote library
23372 Add missing functions to contrib/emacs/vc-git.el
23375 git-svn: fix blocking with svn:// servers after do_switch
23377 Frank Lichtenheld (1):
23378 cvsserver: always initialize state in argsplit()
23381 git-gui: properly popup error if gitk should be started but is not installed
23382 git-commit: don't add multiple Signed-off-by: from the same identity
23384 J. Bruce Fields (2):
23386 user-manual: more explanation of push and pull usage
23389 stash: allow running from a subdirectory
23392 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
23394 Johannes Schindelin (24):
23395 diff --no-index: fix --name-status with added files
23396 glossary: add 'reflog'
23397 Document git-filter-branch
23398 Add diff-option --ext-diff
23399 filter-branch: add a test for the commit removal example
23400 filter-branch: make output nicer
23401 filter-branch: a few more touch ups to the man page
23402 filter-branch documentation: clarify which filters are eval'ed
23403 filter-branch: fail gracefully when a filter fails
23404 Future-proof source for changes in xdemitconf_t
23405 Teach git-stash to "apply --index"
23406 Enable "git rerere" by the config variable rerere.enabled
23407 git-branch: default to --track
23408 Fix "apply --reverse" with regard to whitespace
23409 branch.autosetupmerge: allow boolean values, or "all"
23410 rebase -i: handle --continue more like non-interactive rebase
23411 rebase -i: actually show the diffstat when being verbose
23412 rebase -i: remember the settings of -v, -s and -p when interrupted
23413 rebase -i: put a nice warning into the todo list
23414 rerere: record resolution even if file is not in merge base
23415 Fix core.sharedRepository = 2
23416 Fix --cherry-pick with given paths
23417 Add for_each_remote() function, and extend remote_find_tracking()
23418 branch --track: code cleanup and saner handling of local branches
23421 filter-branch: Avoid an error message in the map function.
23422 filter-branch documentation: some more touch-ups.
23423 Allow rebase to run if upstream is completely merged
23426 fsck --lost-found writes to subdirectories in .git/lost-found/
23428 Junio C Hamano (22):
23429 Update draft Release Notes for 1.5.3
23430 Update reflog message created for stashes
23431 Do not check if getcwd() result begins with a slash.
23432 Fix git-stash(1) markup.
23433 git-stash: allow more descriptive reminder message when saving
23434 Introduce diff_filespec_is_binary()
23435 Per-path attribute based hunk header selection.
23436 Fix configuration syntax to specify customized hunk header patterns.
23437 diff: honor binariness specified in attributes
23438 gitweb: make repeated calls to git_get_project_owner() bearable
23439 diff.c: make built-in hunk header pattern a separate table
23440 git-gui: use "blame -w -C -C" for "where did it come from, originally?"
23441 git-stash: try reusing cached stat info as much as possible
23442 Fix merge-one-file for our-side-added/our-side-removed cases
23443 Document custom hunk header selection
23444 revision.c: remove duplicated parents after history simplification
23445 Revert 88494423 (removal of duplicate parents in the output codepath)
23446 Re-code builtin-branch.c in UTF-8
23447 Teach read-tree 2-way merge to ignore intermediate symlinks
23449 Update list of older git docs
23453 git-submodule(1): update description and key names
23455 Marcus Fritzsch (1):
23456 Fixed a formulation mistake in Documentation/user-manual.txt
23459 Prefer EMAIL to username@hostname.
23460 Change "added.moved or removed" to "added, moved or removed" in
23461 Add [verse] to the SYNOPSIS section of git-submodule.txt.
23463 Matt McCutchen (3):
23464 gitweb: make search form generate pathinfo-style URLs
23465 gitweb: make "No commits" in project list gray, not bold green
23466 Makefile: rebuild git.o on version change, clean up git$X flags
23468 Matthias Lederhofer (3):
23469 git-init: set core.worktree if GIT_WORK_TREE is specified
23470 git-clone: split up long &&-command-chain and use a function for cleanup
23471 make git-clone GIT_WORK_TREE aware
23473 Michael Hendricks (2):
23474 git-send-email: allow an email alias for --from
23475 gitweb: configurable width for the projects list Description column
23478 Document -<n> for git-format-patch
23479 gitweb: prefer git_get_project_owner() over get_file_owner()
23480 gitweb: new cgi parameter: opt
23483 apply delta depth bias to already deltified objects
23484 script to display a distribution of longest common hash prefixes
23485 reduce git-pack-objects memory usage a little more
23487 Paul Mackerras (6):
23488 gitk: Fix the find and highlight functions
23489 gitk: Fix bug in the anc_or_desc routine
23490 gitk: Remove the unused stopfindproc function
23491 gitk: Fix bug causing "can't read commitrow(0,n)" error
23492 gitk: Use git log and add support for --left-right
23493 gitk: Improve handling of -- and ambiguous arguments
23496 diff-lib.c: don't strdup twice
23498 Sean Estabrooks (1):
23499 Alter git-checkout reflog message to include "from" branch
23501 Shawn O. Pearce (46):
23502 git-gui: Unlock the index when cancelling merge dialog
23503 git-gui: Start blame windows as tall as possible
23504 git-gui: Correct resizing of remote branch delete dialog
23505 git-gui: Don't bind F5/M1-R in all windows
23506 git-gui: Bind M1-P to push action
23507 git-gui: Include a Push action on the left toolbar
23508 git-gui: Ensure windows shortcuts always have .bat extension
23509 git-gui: Honor rerere.enabled configuration option
23510 git-gui: New Git version check support routine
23511 git-gui: Skip nicknames when selecting author initials
23512 git-gui: Teach class system to support [$this cmd] syntax
23513 git-gui: Abstract the revision picker into a mega widget
23514 git-gui: Refactor the delete branch dialog to use class system
23515 git-gui: Optimize for newstyle refs/remotes layout
23516 git-gui: Maintain remote and source ref for tracking branches
23517 git-gui: Allow users to match remote branch names locally
23518 git-gui: Fast-forward existing branch in branch create dialog
23519 git-gui: Enhance choose_rev to handle hundreds of branches
23520 git-gui: Sort tags descending by tagger date
23521 git-gui: Option to default new branches to match tracking branches
23522 git-gui: Automatically refresh tracking branches when needed
23523 git-gui: Better handling of detached HEAD
23524 git-gui: Refactor our ui_status_value update technique
23525 git-gui: Refactor branch switch to support detached head
23526 git-gui: Unabbreviate commit SHA-1s prior to display
23527 git-gui: Default selection to first matching ref
23528 git-gui: Allow double-click in checkout dialog to start checkout
23529 git-gui: Extract blame viewer status bar into mega-widget
23530 git-gui: Change the main window progress bar to use status_bar
23531 git-gui: Show a progress meter for checking out files
23532 git-gui: Always use absolute path to all git executables
23533 git-gui: Correct gitk installation location
23534 git-gui: Assume unfound commands are known by git wrapper
23535 git-gui: Treat `git version` as `git --version`
23536 git-gui: Perform our own magic shbang detection on Windows
23537 git-gui: Teach console widget to use git_read
23538 git-gui: Improve the Windows and Mac OS X shortcut creators
23539 git-gui: Correct ls-tree buffering problem in browser
23540 git-gui: Don't linewrap within console windows
23541 git-gui: Paper bag fix for Cygwin shortcut creation
23542 git-gui: Use sh.exe in Cygwin shortcuts
23543 git-gui: Include a space in Cygwin shortcut command lines
23544 Clarify documentation of fast-import's D subcommand
23545 Support wholesale directory renames in fast-import
23546 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
23547 git-gui: Change prior tree SHA-1 verification to use git_read
23549 Steffen Prohaska (1):
23550 filter-branch: added missing warn function
23553 Documentation for git-log --follow
23555 Uwe Kleine-König (2):
23556 stash: end commit log with a newline
23557 repack: don't report "Nothing new to pack." if -q is given
23559 William Pursell (1):
23560 user-manual: fix directory name in git-archive example
23563 Version v1.5.3-rc0; changes since v1.5.2.5:
23564 -------------------------------------------
23567 git-send-email: Add --threaded option
23568 git-send-email: make options easier to configure.
23569 format-patch: Add format.subjectprefix config option
23572 Fix the progress code to output LF only when it is really needed
23573 Add run_command_v_opt_cd: chdir into a directory before exec
23574 Add ability to specify environment extension to run_command
23575 Allow environment variables to be unset in the processes started by run_command
23576 Verbose connect messages to show the IP addresses used
23577 Add another verbosity level to git-fetch
23578 Add a configuration option to control diffstat after merge
23579 Fix push with refspecs containing wildcards
23580 Do not use h_errno after connect(2): the function does not set it
23581 cvsserver: Actually implement --export-all
23582 Avoid perl in t1300-repo-config
23584 Alexandre Julliard (1):
23585 pack-check: Sort entries by pack offset before unpacking them.
23587 Alexandre Vassalotti (1):
23588 git-tag: Fix "can't shift that many".
23590 Andy Whitcroft (3):
23591 cvsimport: add support for new style remote layout
23592 cvsimport: update documentation to include separate remotes option
23593 cvsimport: add <remote>/HEAD reference in separate remotes more
23595 Aneesh Kumar K.V (2):
23596 gitview: Fix the blame interface.
23597 gitview: run blame with -C -C
23599 Benjamin Sergeant (1):
23600 git-p4 fails when cloning a p4 depo.
23602 Brian Gernhardt (1):
23603 Fix t5516-fetch for systems where `wc -l` outputs whitespace.
23606 Fix git-stripspace to process correctly long lines and spaces.
23607 Add test script for git-stripspace.
23608 Add test-script for git-tag
23611 git-mergetool: Allow gvimdiff to be used as a mergetool
23614 Custom compression levels for objects and packs
23615 Alter sha1close() 3rd argument to request flush only
23616 git-repack --max-pack-size: new file statics and code restructuring
23617 git-repack --max-pack-size: write_{object,one}() respect pack limit
23618 git-repack --max-pack-size: split packs as asked by write_{object,one}()
23619 git-repack --max-pack-size: add option parsing to enable feature
23620 pack-objects: clarification & option checks for --max-pack-size
23621 Ensure git-repack -a -d --max-pack-size=N deletes correct packs
23623 Daniel Barkalow (6):
23624 Move remote parsing into a library file out of builtin-push.
23625 Move refspec parser from connect.c and cache.h to remote.{c,h}
23626 Add handlers for fetch-side configuration of remotes.
23627 Update local tracking refs when pushing
23628 Move refspec pattern matching to match_refs().
23629 Fix pushing to a pattern with no dst
23632 Generate tags with correct timestamp (git-svnimport)
23634 Elvis Pranskevichus (1):
23635 Use git-tag in git-cvsimport
23638 git-submodule: Instead of using only annotated tags, use any tags.
23641 git-svn: cleanup: factor out longest_common_path() function
23642 git-svn: test for creating new directories over svn://
23643 git-svn: reduce stat() calls for a backwards compatibility check
23644 git-svn: allow dcommit to retain local merge information
23646 Fernando J. Pereda (1):
23647 Teach mailsplit about Maildir's
23649 Frank Lichtenheld (11):
23650 t9400: Add test cases for config file handling
23651 t9400: Add some more cvs update tests
23652 t9400: Add some basic pserver tests
23653 t9400: Work around CVS' deficiencies
23654 cvsserver: Handle 'cvs login'
23655 cvsserver: Make req_Root more critical of its input data
23656 cvsserver: Add some useful commandline options
23657 cvsserver: Let --base-path and pserver get along just fine
23658 cvsserver: Actually implement --export-all
23659 config: Add --null/-z option for null-delimted output
23660 config: add support for --bool and --int while setting values
23663 Unify write_index_file functions
23666 git-branch: cleanup config file when deleting branches
23667 git-svn: trailing slash in prefix is mandatory with --branches/-b
23668 git-cvsimport: force checkout of working tree after initial import
23670 Han-Wen Nienhuys (28):
23672 reformatting: break long lines.
23673 rename apply() to applyCommit(); apply is a python builtin
23674 add .dotest to .gitignore
23675 Robustness fixes for pipes
23678 clone and sync --keep-path to keep perforce path to module.
23679 use string.strip() iso. slicing.
23680 use strip() iso. slicing for removing \n
23681 add --verbose to all commands.
23682 Extract multiple paths concurrently.
23684 remove global .gitdir
23685 Read p4 files in one batch.
23686 Thinko, fix buglet.
23687 store p4 user cache in home directory.
23689 read files before creating the commit.
23690 don't p4 print deleted files.
23691 only run p4 print if necessary
23692 use p4CmdList() to get file contents in Python dicts. This is more robust.
23693 Cleanups & import into p4/master for local import
23695 thinko: really ignore deleted files.
23696 look for 'text' and 'binary' files.
23697 print error message when p4 print fails (eg. due to permission problems)
23698 also strip p4/ from local imports.
23700 Jakub Narebski (16):
23701 gitweb: Add test t9500 for gitweb (as standalone script)
23702 Add an option to git-ls-tree to display also the size of blob
23703 gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
23704 gitweb: Improve "next" link in commitdiff view
23705 gitweb: Split git_patchset_body into separate subroutines
23706 gitweb: Create special from-file/to-file header for combined diff
23707 gitweb: Add links to blobdiffs in from-file/to-file header for merges
23708 gitweb: '--cc' for merges in 'commitdiff' view
23709 Document git rev-list --full-history
23710 Document git read-tree --trivial
23711 Document git rev-parse --is-inside-git-dir
23712 Document git reflog --stale-fix
23713 Document git rev-list --timestamp
23714 Use tabs for indenting definition list for options in git-log.txt
23715 Document git log --abbrev-commit, as a kind of pretty option
23716 Document git log --full-diff
23719 Add colour support in rebase and merge tree diff stats output.
23720 rev-parse: Identify short sha1 sums correctly.
23723 cmd_log_init: remove parsing of --encoding command line parameter
23724 refactor dir_add_name
23725 dir_struct: add collect_ignored option
23726 builtin-add: simplify (and increase accuracy of) exclude handling
23727 Fix ALLOC_GROW off-by-one
23728 Fix ALLOC_GROW calls with obsolete semantics
23729 git-stash: fix "no arguments" case in documentation
23730 git-stash: fix "can't shift that many" with no arguments
23731 git-stash: don't complain when listing in a repo with no stash
23732 Documentation: quote {non-attributes} for asciidoc
23733 Documentation: quote {non-attributes} for asciidoc
23734 Documentation: minor cleanups to branch/checkout wording
23736 Jeffrey C. Ollie (2):
23737 Add an option to quiet git-init.
23738 Quiet the output from git-init when cloning, if requested.
23741 Don't dereference a strdup-returned NULL
23742 detect close failure on just-written file handles
23743 Don't ignore a pack-refs write failure
23744 git-log: detect dup and fdopen failure
23747 Remove unnecessary code and comments on non-existing 8kB tag object restriction
23749 Johannes Schindelin (23):
23750 Update to SubmittingPatches
23751 Add git-filter-branch
23752 git-fsck: learn about --verbose
23753 Move buffer_is_binary() to xdiff-interface.h
23754 merge-recursive: refuse to merge binary files
23755 git-merge-file: refuse to merge binary files
23756 filter-branch: use $(($i+1)) instead of $((i+1))
23757 filter-branch: fix behaviour of '-k'
23758 t5000: skip ZIP tests if unzip was not found
23759 Teach filter-branch about subdirectory filtering
23760 Teach diff to imply --find-copies-harder upon -C -C
23761 pp_header(): work around possible memory corruption
23762 diffcore-rename: favour identical basenames
23763 filter-branch: add example to move everything into a subdirectory
23764 Move the pick_author code to git-sh-setup
23765 Teach rebase an interactive mode
23766 rebase -i: several cleanups
23767 rebase -i: provide reasonable reflog for the rebased branch
23768 Teach rebase -i about --preserve-merges
23769 t7004: ship trustdb to avoid gpg warnings
23770 git add: respect core.filemode with unmerged entries
23771 Make '!' aliases more useful
23772 git-fsck: add --lost-found option
23775 filter-branch: Use rev-list arguments to specify revision ranges.
23776 filter-branch: also don't fail in map() if a commit cannot be mapped
23777 Makefile: Remove git-merge-base from PROGRAMS.
23778 filter-branch: Simplify parent computation.
23779 filter-branch: subdirectory filter needs --full-history
23780 Avoid double-slash in path names that depend on $(sharedir).
23781 Remove trailing slash from $(template_dir).
23782 git-remote show: Also shorten non-fast-forward refs in the 'push' listing
23783 Test 'git add' for unmerged entries when core.symlinks=false.
23786 Add the --numbered-files option to git-format-patch.
23789 Fix git-am(1) synopsis formatting
23790 git-rebase: suggest to use git-add instead of git-update-index
23793 Fix typo in git-mergetool
23795 Julian Phillips (2):
23796 Makefile: Use generic rule to build test programs
23797 new-workdir: handle rev-parse --git-dir not always giving full path
23799 Junio C Hamano (48):
23800 git-apply: Fix removal of new trailing blank lines.
23801 pack-objects: pass fullname down to add_object_entry()
23802 Teach "delta" attribute to pack-objects.
23803 builtin-pack-objects: remove unnecessary code for no-delta
23804 Fix command line parameter parser of revert/cherry-pick
23805 Remove git-applypatch
23806 mailsplit: fix for more than one input files
23807 Add DLH to .mailmap
23808 Release Notes: start preparing for 1.5.3
23809 git-apply: what is detected and fixed is not just trailing spaces.
23810 t7003: make test repeatable
23811 git-branch --track: fix tracking branch computation.
23813 Test wildcard push/fetch
23814 More missing static
23815 More missing static
23816 Even more missing static
23817 remote.c: refactor match_explicit_refs()
23818 remote.c: refactor creation of new dst ref
23819 remote.c: minor clean-up of match_explicit()
23820 remote.c: fix "git push" weak match disambiguation
23821 remote.c: "git-push frotz" should update what matches at the source.
23822 git-push: Update description of refspecs and add examples
23823 git-blame: do not indent with spaces.
23824 git-blame -w: ignore whitespace
23825 mktag: minimally update the description.
23826 Lift 16kB limit of log message output
23827 Extend --pretty=oneline to cover the first paragraph,
23828 Makefile: common-cmds.h depends on generate-cmdlist.sh script
23829 Makefile: allow generating git.o for debugging purposes
23830 -Wold-style-definition fix
23832 Documentation: update "stale" links for 1.5.2.2
23833 INSTALL: explain how to build documentation
23834 Two trivial -Wcast-qual fixes
23835 git-send-email: Do not make @-less message ID
23836 Add core.quotepath configuration variable.
23837 Update draft Release Notes for 1.5.3
23838 diffcore_count_changes: pass diffcore_filespec
23839 diffcore_filespec: add is_binary
23840 diffcore-delta.c: update the comment on the algorithm.
23841 diffcore-delta.c: Ignore CR in CRLF for text files
23842 git-stash: require "save" to be explicit and update documentation
23843 Update public documentation links for 1.5.2.3
23844 "git-push $URL" without refspecs pushes only matching branches
23845 Rewrite "git-frotz" to "git frotz"
23846 git-stash: make "save" the default action again.
23847 Mark disused commit walkers officially deprecated.
23850 git-p4: check for existence of repo dir before trying to create
23853 Add git-submodule command
23854 Add basic test-script for git-submodule
23855 git-submodule: move cloning into a separate function
23856 git-submodule: clone during update, not during init
23857 t7400: barf if git-submodule removes or replaces a file
23858 git-submodule: remember to checkout after clone
23859 Rename sections from "module" to "submodule" in .gitmodules
23860 git-submodule: give submodules proper names
23862 gitmodules(5): remove leading period from synopsis
23864 Linus Torvalds (9):
23865 Make "git gc" pack all refs by default
23866 Make the pack-refs interfaces usable from outside
23867 Makefile: add an explicit rule for building assembly output
23868 Finally implement "git log --follow"
23869 Fix up "git log --follow" a bit..
23870 Clean up internal command handling
23871 Check for IO errors after running a command
23872 git: Try a bit harder not to lose errno in stdio
23873 Start deprecating "git-command" in favor of "git command"
23875 Marco Costalba (1):
23876 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
23878 Marius Storm-Olsen (7):
23879 Make the command call silent
23880 Replace \r\n with \n when importing from p4 on Windows
23881 Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
23882 Fix git-p4 clone (defaultDestination)
23883 Fix single branch import into remotes
23884 Exclude the HEAD symbolic ref from the list of known branches
23885 Only use double quotes on Windows
23888 gitk: Make selection highlight color configurable
23889 gitk: Update fontsize in patch / tree list
23890 gitk: Allow specifying tabstop as other than default 8 characters.
23891 gitweb.perl - Optionally send archives as .zip files
23892 gitk: Use a spinbox for setting tabstop settings
23893 gitk: Update selection background colorbar in prefs dialog
23895 Martin Koegler (5):
23896 builtin-pack-objects: don't fail, if delta is not possible
23897 git-pack-objects: cache small deltas between big objects
23898 builtin-pack-object: cache small deltas
23899 diff-delta: use realloc instead of xrealloc
23900 gitweb: Handle non UTF-8 text better
23903 rename dirlink to gitlink.
23905 Matthias Lederhofer (18):
23906 add git-filter-branch to .gitignore
23907 make clean should remove all the test programs too
23908 filter-branch: prevent filters from reading from stdin
23909 chmod +x git-filter-branch.sh
23910 rev-parse: document --is-inside-git-dir
23911 rev-parse: introduce --is-bare-repository
23913 introduce GIT_WORK_TREE to specify the work tree
23914 Use new semantics of is_bare/inside_git_dir/inside_work_tree
23915 extend rev-parse test for --is-inside-work-tree
23917 setup_git_directory: fix segfault if repository is found in cwd
23918 filter-branch: always export GIT_DIR if it is set
23919 gitweb: change filename/directory name of snapshots
23920 make git barf when an alias changes environment variables
23921 make dist: include configure script in tarball
23922 ignore git-rebase--interactive
23923 getenv/setenv: use constants if available
23925 Matthijs Melchior (1):
23926 Teach git-tag about showing tag annotations.
23928 Michael Ellerman (2):
23929 gitview: Use new-style classes
23930 gitview: Define __slots__ for Commit
23932 Michael Krelin (1):
23933 git-svn: honor ~/.subversion/ client cert file settings.
23935 Michael S. Tsirkin (1):
23936 connect: display connection progress
23938 Nanako Shiraishi (3):
23939 Cloning from a repo without "current branch"
23940 Add git-stash script
23944 allow for undeltified objects not to be reused
23945 make "repack -f" imply "pack-objects --no-reuse-object"
23946 deprecate the new loose object header format
23947 fixes to output of git-verify-pack -v
23948 improve delta long block matching with big files
23949 update diff-delta.c copyright
23950 fix repack with --max-pack-size
23951 always start looking up objects in the last used pack first
23953 Paul Mackerras (18):
23954 gitk: Use the -q flag to git checkout
23955 gitk: New infrastructure for working out branches & previous/next tags
23956 gitk: Don't try to list large numbers of tags or heads in the details pane
23957 gitk: Add some more comments to the optimize_rows procedure
23958 gitk: Improve the behaviour of the initial selection
23959 gitk: Implement a simple scheduler for the compute-intensive stuff
23960 gitk: Cope with commit messages with carriage-returns and initial blank lines
23961 gitk: Disable the head context menu entries for the checked-out branch
23962 gitk: Store ids in rowrangelist and idrowranges rather than row numbers
23963 gitk: New algorithm for drawing the graph lines
23964 gitk: Show local uncommitted changes as a fake commit
23965 gitk: Speed up the reading of references
23966 gitk: Get rid of the childlist variable
23967 gitk: Add a "reset branch to here" row context-menu operation
23968 gitk: Limit how often we change the canvas scrolling region
23969 gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
23970 gitk: Improve handling of whitespace and special chars in filenames
23971 gitk: Add a progress bar to show progress while resetting
23974 git-rev-list: Add regexp tuning options
23975 git-applymbox: Remove command
23977 Pierre Habouzit (3):
23978 $EMAIL is a last resort fallback, as it's system-wide.
23979 Active_nr is unsigned, hence can't be < 0
23983 git.spec: RPM failed, looking for wrong files.
23985 Randal L. Schwartz (1):
23986 Add test-sha1 to .gitignore.
23989 t5000: silence unzip availability check
23990 diffcore-rename: don't change similarity index based on basename equality
23991 diff: round down similarity index
23993 Robin Rosenberg (1):
23994 Add option to cvs update before export
23997 git-svn: avoid string eval for defining functions
23998 git-svn: use git-log rather than rev-list | xargs cat-file
23999 git-svn: cache max revision in rev_db databases
24001 Shawn O. Pearce (24):
24002 Teach git-describe how to run name-rev
24003 Lazily open pack index files on demand
24004 Micro-optimize prepare_alt_odb
24005 Attempt to delay prepare_alt_odb during get_sha1
24007 git-gui: GUI support for running 'git remote prune <name>'
24008 git-gui: Show the git-gui library path in 'About git-gui'
24009 git-gui: Enable verbose Tcl loading earlier
24010 git-gui: Provide fatal error if library is unavailable
24011 git-gui: Disable tearoff menus on Windows, Mac OS X
24012 git-gui: Allow users to rename branches through 'branch -m'
24013 git-gui: Allow users to delete remote branches
24014 git-gui: Expose the merge.diffstat configuration option
24015 Allow contrib new-workdir to link into bare repositories
24016 Test for recent rev-parse $abbrev_sha1 regression
24017 Simplify index access condition in count-objects, pack-redundant
24018 Ensure the pack index is opened before access
24019 Style nit - don't put space after function names
24020 git-gui: Internalize symbolic-ref HEAD reading logic
24021 git-gui: Quiet our installation process
24022 Avoid src:dst syntax as default bash completion for git push
24023 Document git-gui, git-citool as mainporcelain manual pages
24024 Teach bash how to complete +refspec on git-push
24025 Correct usages of sed in git-tag for Mac OS X
24027 Simon Hausmann (223):
24028 Initial import of a python script to import changesets from Perforce into git.
24029 Added basic support for specifying the depot path to import from as well as the range of perforce changes.
24030 Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
24031 Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
24032 Some fixes to the timezone conversion between the date of a perforce change and the git commit.
24033 Speed up the import of individual files from Perforce into git by passing the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics.
24034 Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
24035 Changed the import mechanism to write to git fast-import through a pipe instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import.
24036 Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
24037 Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
24038 Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
24039 Avoid calling fstat for every imported file (slow!) and instead read the file data first into the python process and use the length of the bytes read for the size field of git fast-import.
24040 Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
24041 Fixed displaying import progress by calling flush on stdout.
24042 Create a git tag for every changeset imported from perforce.
24043 Fix file permissions of p4-fast-export.py to be executable.
24044 Started working on incremental imports from Perforce.
24045 Simplify the incremental import by elimination the need for a temporary import branch.
24046 Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
24047 Initial support for importing a directory from Perforce at a specified revision.
24048 Minor cleanups and print an error message of git fast-import if it fails.
24049 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
24050 Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
24051 Make specifying the revision ranges more convenient.
24052 Fix calculation of the newest imported revision for #head imports.
24053 Catch io exceptions from git fast-import again and print the error message.
24054 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
24055 Added a little helper script to debug the output of the p4 python interface.
24056 Minor code cleanups.
24057 Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
24058 Changed the default git import branch from "p4" to "master".
24059 Added a little helper script to remove unused tags from the perforce import.
24060 Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number.
24061 Cleanups, remove unused variable.
24063 Started work on p4 branch detection (experimental!).
24064 More fixes in heuristic p4 branch detection based on common path components.
24065 After marking a p4 branch as merged don't ever merge it in git again.
24066 Set git fast-import marks for every imported change for future use.
24067 When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
24068 Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
24069 Use sets.Set() instead of set() to run also with older versions of Python.
24070 Fix single-branch imports by skipping the branch/merge detection correctly.
24071 Added p4 delete behavioural emulation as todo item.
24072 Added support for --silent so that p4-fast-export can be called from cronjobs.
24073 More work in --silent support.
24074 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
24075 Adjust the output parsing of git name-rev to handle the output of the latest git version.
24076 Work in progress on detecting branches.
24077 Changed --known-branches to take a file as argument instead of a comma separated list.
24078 Fixed p4-debug file extension.
24079 Make the p4 data/command cache configurable through the --cache-debug commandline option.
24080 Minor code cleanups.
24081 More code cleanups and preparations for more branch detection heuristics.
24082 More work on branch detection by implementing changeIsBranchMerge().
24083 Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
24084 Split up the cache commandline options into (command) cache and data cache.
24085 First version of a new script to submit changes back to perforce from git repositories.
24086 Fix git-dir option and allow reading log substitutions from a file
24087 Lots of bugfixes to p4-git-sync.
24088 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
24089 Be nice and use /usr/bin/env python for the git-p4 scripts
24090 Ignore Apple resource files when importing from perforce to git.
24091 Auto-detect the current git branch before submitting back to perforce.
24092 Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
24093 Default to interactive syncing
24094 Improved the git dir detection.
24095 Pass the right number of arguments to commit, fixes single-branch imports.
24096 Start moving the git-p4 tools into one single script.
24097 Provide a little bit of help description for the git-p4 "tools".
24098 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
24099 Part of the code is copyright by Trolltech ASA.
24100 sync-to-perforce is now called submit and fixed the gitdir check a little bit
24101 Completely untested "merge" of p4-fast-export.py into git-p4.py
24102 Added missing "self"s to make the script evaluate correctly.
24103 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
24104 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
24105 Start of the git-p4 documentation.
24106 Documentation enhancements.
24107 Added experimental but super-fast --apply-as-patch option to git-p4 submit
24108 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
24109 Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
24110 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
24111 Don't show the submit template and the diff first in less but show it in $editor right away
24112 Removed the .py extension from git-p4 as it's annoying to type every time.
24113 Changed the format of the imported log message slightly, so that it's easier to parse again.
24114 Changed the default branch for imports from "master" to "p4"
24115 Added some helper function(s) to parse the depot path and change number from the log message
24116 Helper function to check the existance of a revision
24117 Set the default branch in run, not in the constructor
24118 Brand new smart incremental import that doesn't need tags or git repo-config :)
24119 Make it possible to run git-p4 submit from within the git repository
24120 Use the new incremental import style by default
24121 Different versions of p4 have different output for the where command ;(
24122 Minor cosmetic fixlet for the git-p4 submit sync question.
24123 Prefer git command over git-command.
24124 Don't try to parse any options with git-p4 debug but pass it straight on to p4
24125 git-p4 debug doesn't need a git repository
24126 Added support for mapping p4 labels to git tags
24127 Fix variable usage in tag import
24128 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch.
24129 Fix "compilation" :)
24130 Clean up python class names.
24131 Added git-p4 rebase convenience
24132 Provide a tree summary after git-p4 rebase
24133 Turn off potentially slow label detection by default
24134 Honor --silent for labels
24135 Added git-p4 clone convenience command
24136 Fix file determination for #head imports
24137 fix variable usage (oops)
24138 Added a simple example of usage to the "documentation" :)
24139 Allow for convenient rebasing after git-p4 submit
24140 Print an error message of some sort if git fast-import fails.
24141 Fix the timezone formatting. Now qgit also displays (parses) it correctly.
24142 Removed the old patch apply code from git-p4 submit.
24143 Slightly improved formatting of the raw_input questions.
24144 A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command
24145 Handle patch errors in git-p4 submit better.
24148 cleanup, renamed self.globalPrefix to self.depotPath
24149 Cleanup, removed the old tagging code
24150 Document some implementation details, for the curious... :)
24151 Use the subprocess module instead of popen2 to make it work on Windows.
24152 Added a little .bat wrapper from Marius
24153 Make sure all popen calls use binary mode (for Windows) and
24154 Make submitting work on Windows.
24155 Converted to unix newlines
24156 Fix git-p4 clone //depot/project (head import)
24157 Make git-p4 work with bare repositories.
24158 Added the possibility of skipping patches during git-p4 submit
24159 Give a better hint if git-p4 submit fails
24160 Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
24161 A little todo note before I forget it :), based on a suggestion from Lars.
24162 Fixing syncing (gitdir discovery / cd) for bare repositories
24163 Always pass a sha1 for the initial parent so that git-fast-import doesn't think it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)
24164 Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!).
24165 Removed cleantags command. It doesn't have any meaning anymore.
24166 Removed ancient and unused code to find the last imported revision from previous imports to use for the current import by looking at the p4 tags. The current approach of using the log message works better.
24167 Create the origin based import branch using git update-ref instead of git branch so that it's possible to have the import branch in refs/remotes.
24168 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4.
24169 Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching.
24170 Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
24171 Removed todo item that is implemented :)
24172 Fix branch setup after initial clone.
24173 Removed unused cache variables.
24174 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
24175 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch.
24176 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import.
24177 Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops).
24178 More cleanups and speedups for labels and branches
24179 Removed unused variable, more cleanups
24180 Cache the output of "p4 users" for faster syncs on high latency links.
24181 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
24182 Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
24183 Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path.
24184 Added support for git-p4 submit --direct (experimental)
24185 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.
24186 Had an idea for debugging, record it :)
24187 Another (potentially life-saving) idea for submit --direct
24188 Improved output for multi branch imports and noted another little todo item
24189 Fix conversion from old style heads/p4 to remotes/p4/master
24190 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
24191 Fix git symbolic-ref warning on initial clone
24192 Detect with git-p4 submit --direct when there are no changes in the working directory
24193 Make git-p4 submit --direct safer by also creating a git commit
24194 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
24195 Fix branch detection in multi-branch imports
24196 Fixes for rollback, delete branches that did not exist at the specified p4 change
24197 Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise.
24198 Added support for --max-changes=<count> to ease import debugging
24199 Use refs/heads/* instead of refs/heads/p4/* for local imports
24201 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
24202 Make rollback work with locally imported branches
24203 Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
24204 Oops, fill the /list/ correct with the p4 exit code.
24205 Catch p4 errors in rollback early enough (before deleting refs!)
24206 Fix p4 execution in git-p4 rollback.
24207 Fix multi-branch import with --silent.
24208 Load the user map from p4 only once at run-time.
24209 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
24210 Forgot to remove this return statement from debugging
24211 Added support for --with-origin with multi-branch imports
24212 Oops, fix --with-origin to /really/ also call git fetch :)
24213 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
24214 Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
24215 Make --with-origin also work without origin :)
24216 Make --with-origin the default for syncing.
24217 Shortcut the case where we have no origin branch
24218 Forgot to remove this TODO item when I made --with-origin the default :)
24219 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
24220 Fix creation of refs/remotes/p4/HEAD symbolic ref
24221 Fix my email address, this isn't really KDE related :)
24222 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen.
24223 Fix typo in listExistingP4Branches that broke sync.
24224 Fix support for "depot-path" in older git-p4 imports
24225 Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one.
24226 Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
24227 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone
24230 Fix depot-path determination for git-p4 submit
24231 Make clone behave like git clone by default again.
24232 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports.
24233 Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from).
24234 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin.
24235 Fix updating/creating remotes/p4/* heads from origin/p4/*
24236 Fix project name guessing
24237 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
24238 Fix support for explicit disabling of syncing with the origin
24239 Write out the options tag in the log message of imports only if we actually have options
24240 Provide some information for single branch imports where the commits go
24241 Mention remotes/p4/master also in the documentation.
24242 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
24243 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method.
24244 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master
24245 Fix initial multi-branch import.
24246 Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
24247 Warn about conflicting p4 branch mappings and use the first one found.
24248 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
24249 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
24250 git-new-workdir: Fix shell warning about operator == used with test.
24252 Sven Verdoolaege (4):
24253 git-update-ref: add --no-deref option for overwriting/detaching ref
24254 t9500: skip gitweb tests if perl version is too old
24255 git-submodule: provide easy way of adding new submodules
24256 git-clone: fetch possibly detached HEAD over dumb http
24259 Add --aggressive option to 'git gc'
24260 Fix minor grammatical typos in the git-gc man page
24261 git-mergetool: Make default selection of merge-tool more intelligent
24262 Don't fflush(stdout) when it's not helpful
24265 Change default man page path to /usr/share/man
24268 Version v1.5.2.5; changes since v1.5.2.4:
24269 -----------------------------------------
24271 Christian Couder (1):
24272 rev-list --bisect: fix allocation of "int*" instead of "int".
24274 Julian Phillips (1):
24275 Force listingblocks to be monospaced in manpages
24277 Junio C Hamano (4):
24278 Do not expect unlink(2) to fail on a directory.
24279 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
24280 Fix "git add -u" data corruption.
24283 Linus Torvalds (1):
24284 apply: remove directory that becomes empty by renaming the last file away
24286 Salikh Zakirov (1):
24287 git-add -u paths... now works from subdirectory
24290 Version v1.5.2.4; changes since v1.5.2.3:
24291 -----------------------------------------
24294 Make git-prune submodule aware (and fix a SEGFAULT in the process)
24295 user-manual: grammar and style fixes
24298 git-gui: properly popup error if gitk should be started but is not installed
24300 J. Bruce Fields (2):
24302 user-manual: more explanation of push and pull usage
24305 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
24307 Johannes Schindelin (3):
24308 diff --no-index: fix --name-status with added files
24309 glossary: add 'reflog'
24310 Fix "apply --reverse" with regard to whitespace
24312 Junio C Hamano (2):
24313 Teach read-tree 2-way merge to ignore intermediate symlinks
24316 Michael Hendricks (1):
24317 Correctly document the name of the global excludes file configuration
24320 Document -<n> for git-format-patch
24322 Shawn O. Pearce (10):
24323 git-gui: Unlock the index when cancelling merge dialog
24324 git-gui: Don't bind F5/M1-R in all windows
24325 git-gui: Bind M1-P to push action
24326 git-gui: Include a Push action on the left toolbar
24327 git-gui: Ensure windows shortcuts always have .bat extension
24328 git-gui: Skip nicknames when selecting author initials
24329 git-gui: Correct ls-tree buffering problem in browser
24330 git-gui: Don't linewrap within console windows
24331 Clarify documentation of fast-import's D subcommand
24332 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
24334 William Pursell (1):
24335 user-manual: fix directory name in git-archive example
24338 Version v1.5.2.3; changes since v1.5.2.2:
24339 -----------------------------------------
24341 Frank Lichtenheld (2):
24342 config: Complete documentation of --get-regexp
24343 config: Change output of --get-regexp for valueless keys
24345 Junio C Hamano (1):
24348 Linus Torvalds (1):
24349 Fix zero-object version-2 packs
24352 Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
24355 cleanup merge-base test script
24356 repack: improve documentation on -a option
24357 git-remote: document -n
24359 Shawn O. Pearce (5):
24360 git-gui: Correctly install to /usr/bin on Cygwin
24361 git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
24362 git-gui: Don't require $DISPLAY just to get --version
24363 git-gui: Don't nice git blame on MSYS as nice is not supported
24364 git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
24366 Sven Verdoolaege (1):
24367 Ignore submodule commits when fetching over dumb protocols
24370 Version v1.5.2.2; changes since v1.5.2.1:
24371 -----------------------------------------
24374 Make the installation target of git-gui a little less chatty
24375 Fix clone to setup the origin if its name ends with .git
24376 Add a local implementation of hstrerror for the system which do not have it
24379 Fix typo in remote branch example in git user manual
24381 J. Bruce Fields (4):
24382 user-manual: quick-start updates
24383 user-manual: add a missing section ID
24384 Documentation: user-manual todo
24385 tutorial: use "project history" instead of "changelog" in header
24387 Jakub Narebski (1):
24388 Generated spec file to be ignored is named git.spec and not git-core.spec
24390 Johannes Schindelin (2):
24391 Move buffer_is_binary() to xdiff-interface.h
24392 merge-recursive: refuse to merge binary files
24395 Accept dates before 2000/01/01 when specified as seconds since the epoch
24397 Junio C Hamano (6):
24398 checkout: do not get confused with ambiguous tag/branch names
24399 $EMAIL is a last resort fallback, as it's system-wide.
24400 git-branch --track: fix tracking branch computation.
24401 Avoid diff cost on "git log -z"
24402 Documentation: adjust to AsciiDoc 8
24405 Kristian Høgsberg (1):
24406 Unquote From line from patch before comparing with given from address.
24408 Luiz Fernando N. Capitulino (1):
24409 git-cherry: Document 'limit' command-line option
24411 Matthijs Melchior (1):
24412 New selection indication and softer colors
24414 Michael Milligan (1):
24415 git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
24418 fix documentation of unpack-objects -n
24419 Don't assume tree entries that are not dirs are blobs
24421 Shawn O. Pearce (47):
24422 git-gui: Allow creating a branch when none exists
24423 git-gui: Allow as few as 0 lines of diff context
24424 git-gui: Don't quit when we destroy a child widget
24425 git-gui: Attach font_ui to all spinbox widgets
24426 git-gui: Verify Tcl/Tk is new enough for our needs
24427 Revert "Make the installation target of git-gui a little less chatty"
24428 git-gui: Add a 4 digit commit abbreviation to the blame viewer
24429 git-gui: Cleanup blame::new widget initialization
24430 git-gui: Remove empty blank line at end of blame
24431 git-gui: Improve the coloring in blame viewer
24432 git-gui: Simplify consecutive lines that come from the same commit
24433 git-gui: Use arror cursor in blame viewer file data
24434 git-gui: Display tooltips in blame viewer
24435 git-gui: Highlight the blame commit header from everything else
24436 git-gui: Remove unnecessary reshow of blamed commit
24437 git-gui: Cleanup minor style nit
24438 git-gui: Space the commit group continuation out in blame view
24439 git-gui: Show author initials in blame groups
24440 git-gui: Allow the user to control the blame/commit split point
24441 git-gui: Display a progress bar during blame annotation gathering
24442 git-gui: Allow digging through history in blame viewer
24443 git-gui: Combine blame groups only if commit and filename match
24444 git-gui: Show original filename in blame tooltip
24445 git-gui: Use a label instead of a button for the back button
24446 git-gui: Clip the commit summaries in the blame history menu
24447 git-gui: Remove the loaded column from the blame viewer
24448 git-gui: Remove unnecessary space between columns in blame viewer
24449 git-gui: Use lighter colors in blame view
24450 git-gui: Make the line number column slightly wider in blame
24451 git-gui: Automatically expand the line number column as needed
24452 git-gui: Remove unused commit_list from blame viewer
24453 git-gui: Better document our blame variables
24454 git-gui: Cleanup redundant column management in blame viewer
24455 git-gui: Switch internal blame structure to Tcl lists
24456 git-gui: Label the uncommitted blame history entry
24457 git-gui: Rename fields in blame viewer to better descriptions
24458 git-gui: Display the "Loading annotation..." message in italic
24459 git-gui: Run blame twice on the same file and display both outputs
24460 git-gui: Display both commits in our tooltips
24461 git-gui: Jump to original line in blame viewer
24462 git-gui: Use three colors for the blame viewer background
24463 git-gui: Improve our labeling of blame annotation types
24464 git-gui: Favor the original annotations over the recent ones
24465 git-gui: Changed blame header bar background to match main window
24466 git-gui: Include 'war on whitespace' fixes from git.git
24467 git-gui: Give amend precedence to HEAD over MERGE_MSG
24468 git-gui: Save geometry before the window layout is damaged
24470 William Pursell (1):
24471 Make command description imperative statement, not third-person present.
24474 Version v1.5.2.1; changes since v1.5.2:
24475 ---------------------------------------
24478 Fix mishandling of $Id$ expanded in the repository copy in convert.c
24479 Add test case for $Id$ expanded in the repository
24482 fix memory leak in parse_object when check_sha1_signature fails
24485 git-svn: avoid md5 calculation entirely if SVN doesn't provide one
24487 Fernando J. Pereda (1):
24488 Use PATH_MAX instead of TEMPFILE_PATH_LEN
24490 Frank Lichtenheld (7):
24491 t1300: Add tests for git-config --bool --get
24492 git-config: Correct asciidoc documentation for --int/--bool
24493 cvsserver: Correct inetd.conf example in asciidoc documentation
24494 cvsserver: Note that CVS_SERVER can also be specified as method variable
24495 cvsserver: Fix some typos in asciidoc documentation
24496 git-config: Various small fixes to asciidoc documentation
24497 git-config: Improve documentation of git-config file handling
24499 Jakub Narebski (3):
24500 Documentation: Clean up links in GIT Glossary
24501 Replace the last 'dircache's by 'index'
24502 Documentation: Add definition of "evil merge" to GIT Glossary
24505 Documentation: fix git-config.xml generation
24507 James Y Knight (1):
24508 Fix git-svn to handle svn not reporting the md5sum of a file, and test.
24511 git-am: use printf instead of echo on user-supplied strings
24512 More echo "$user_message" fixes.
24513 Documentation: robustify asciidoc GIT_VERSION replacement
24515 Jerald Fitzjerald (1):
24516 decode_85(): fix missing return.
24519 git-daemon: don't ignore pid-file write failure
24522 Fix stupid typo in lookup_tag()
24524 Johannes Schindelin (2):
24525 SubmittingPatches: mention older C compiler compatibility
24526 git-status: respect core.excludesFile
24529 branch: fix segfault when resolving an invalid HEAD
24530 Update bash completion to ignore some more plumbing commands
24533 Create a new manpage for the gitignore format, and reference it elsewhere
24535 Junio C Hamano (6):
24536 annotate: make it work from subdirectories.
24537 git-cvsserver: fix disabling service via per-method config
24538 name-rev: tolerate clock skew in committer dates
24539 git-commit: use printf '%s\n' instead of echo on user-supplied strings
24540 Add tests for the last two fixes.
24543 Kristian Høgsberg (1):
24544 Use =20 when rfc2047 encoding spaces.
24546 Linus Torvalds (1):
24547 fix signed range problems with hex conversions
24549 Nguyễn Thái Ngọc Duy (1):
24550 Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
24553 Document branch.autosetupmerge.
24555 Shawn O. Pearce (12):
24556 git-gui: Tighten internal pattern match for lib/ directory
24557 Refactor fast-import branch creation from existing commit
24558 Fix possible coredump with fast-import --import-marks
24559 Hide the plumbing diff-{files,index,tree} from bash completion
24560 Teach bash completion about git-shortlog
24561 Remove a duplicate --not option in bash completion
24562 Update bash completion header documentation
24563 Teach bash completion about 'git remote update'
24564 Teach bash completion about recent log long options
24565 Update bash completion for git-config options
24566 Correct key bindings to Control-<foo>
24567 git-gui: Guess our share/git-gui/lib path at runtime if possible
24569 Simon Hausmann (2):
24570 fast-import: Fix uninitialized variable
24571 fast-import: Fix crash when referencing already existing objects
24573 Steffen Prohaska (1):
24574 user-manual: fixed typo in example
24576 Stephan Springl (1):
24577 Use git-for-each-ref to check whether the origin branch exists.
24579 Sven Verdoolaege (1):
24580 unpack-trees.c: verify_uptodate: remove dead code
24583 Version v1.5.2; changes since v1.5.2-rc3:
24584 -----------------------------------------
24587 Allow fetching references from any namespace
24590 Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
24591 Fix crlf attribute handling to match documentation
24593 Andy Whitcroft (1):
24594 git name-rev writes beyond the end of malloc() with large generations
24597 git-svn: don't drop the username from URLs when dcommit is run
24598 git-svn: clean up caching of SVN::Ra functions
24599 git-svn: fix segfaults due to initial SVN pool being cleared
24600 git-svn: don't attempt to minimize URLs by default
24601 git-svn: avoid crashing svnserve when creating new directories
24602 git-svn: don't minimize-url when doing an init that tracks multiple paths
24604 Frank Lichtenheld (5):
24605 cvsserver: Limit config parser to needed options
24606 cvsserver: Don't send mixed messages to clients
24607 builtin-log.c: Fix typo in comment
24608 Documentation: format-patch has no --mbox option
24609 git-am: Clean up the asciidoc documentation
24611 J. Bruce Fields (14):
24612 user-manual: revise birdseye-view chapter
24613 glossary: expand and clarify some definitions, prune cross-references
24614 user-manual: move quick-start to an appendix
24615 Documentation: remove howto's now incorporated into manual
24616 user-manual: move howto/make-dist.txt into user manual
24617 user-manual: move howto/using-topic-branches into manual
24618 user-manual: add a "counting commits" example
24619 user-manual: introduce git
24620 user-manual: listing commits reachable from some refs not others
24621 user-manual: reorganize public git repo discussion
24622 tutorials: add user-manual links
24623 tutorial: revise index introduction
24624 user-manual: discourage shared repository
24625 user-manual: finding commits referencing given file content
24627 Jakub Narebski (10):
24628 gitweb: Test if $from_id and $to_id are defined before comparison
24629 gitweb: Check if requested object exists
24630 gitweb: Fix "Use of unitialized value" warnings in empty repository
24631 Documentation: Split description of pretty formats of commit log
24632 gitweb: Add a few comments about %feature hash
24633 gitweb: Do not use absolute font sizes
24634 gitweb: Separate search regexp from search text
24635 gitweb: Empty patch for merge means trivial merge, not no differences
24636 gitweb: Fix error in git_patchset_body for deletion in merge commit
24637 gitweb: Fix "Use of uninitialized value" warning in git_feed
24640 Updated documentation of hooks in git-receive-pack.
24641 Minor fixup to documentation of hooks in git-receive-pack.
24644 git-add: allow path limiting with -u
24645 Documentation/git-add: clarify -u with path limiting
24646 format-patch: add MIME-Version header when we add content-type.
24649 Fix signedness on return value from xread()
24650 Ensure return value from xread() is always stored into an ssize_t
24651 user-manual: Add section on ignoring files
24653 Johannes Schindelin (2):
24654 import-tars: Use the "Link indicator" to identify directories
24655 Add a birdview-on-the-source-code section to the user manual
24657 Junio C Hamano (17):
24658 Minor copyediting on Release Notes for 1.5.2
24659 Add has_symlink_leading_path() function.
24660 apply: do not get confused by symlinks in the middle
24661 read-tree -m -u: avoid getting confused by intermediate symlinks.
24662 t9400: Use the repository config and nothing else.
24663 checkout: allow detaching to HEAD even when switching to the tip of a branch
24664 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
24665 Link to HTML version of external doc if available
24666 Fix git-clone buglet for remote case.
24667 Prepare for 1.5.1.5 Release Notes
24668 gitweb: fix another use of undefined value
24670 Add link to 1.5.1.5 release notes.
24671 Documentation/git.txt: Update links to older documentation pages.
24673 git-cvsserver: exit with 1 upon "I HATE YOU"
24677 git-archive: don't die when repository uses subprojects
24679 Marco Costalba (1):
24680 Fix an unmatched comment end in arm/sha1_arm.S
24682 Matthias Kestenholz (2):
24683 Documentation: Added [verse] to SYNOPSIS where necessary
24684 Documentation: Reformatted SYNOPSIS for several commands
24686 Matthieu Castet (1):
24687 Remove stale non-static-inline prototype for tree_entry_extract()
24689 Michael Hendricks (2):
24690 git-send-email: allow leading white space on mutt aliases
24691 Document core.excludesfile for git-add
24694 gitweb: Normalize searchbar font size
24695 gitweb: Add support for grep searches
24696 gitweb: Allow arbitrary strings to be dug with pickaxe
24697 Documentation: git-rev-list's "patterns"
24698 gitweb: Remove redundant $searchtype setup
24701 RPM spec: include files in technical/ to package.
24702 Documentation/branch: fix small typo in -D example
24705 git-archive: convert archive entries like checkouts do
24707 Shawn O. Pearce (1):
24708 git-gui: Gracefully handle bad TCL_PATH at compile time
24710 Steffen Prohaska (4):
24711 tiny fix in documentation of git-clone
24712 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
24713 Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
24714 Fixed link in user-manual
24717 Version v1.5.2-rc3; changes since v1.5.2-rc2:
24718 ---------------------------------------------
24721 Use GIT_OBJECT_DIR for temporary files of pack-objects
24723 Amos Waterland (1):
24724 wcwidth redeclaration
24726 Frank Lichtenheld (1):
24727 cvsserver: Add test cases for git-cvsserver
24730 gitweb: choose appropriate view for file type if a= parameter missing
24732 J. Bruce Fields (7):
24733 user-manual: more discussion of detached heads, fix typos
24734 user-manual: add section ID's
24735 user-manual: clean up fast-forward and dangling-objects sections
24736 user-manual: fix .gitconfig editing examples
24737 user-manual: miscellaneous editing
24738 user-manual: stop deprecating the manual
24739 user-manual: fix clone and fetch typos
24741 Jakub Narebski (6):
24742 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
24743 gitweb: Add combined diff support to git_difftree_body
24744 gitweb: Add combined diff support to git_patchset_body
24745 gitweb: Make it possible to use pre-parsed info in git_difftree_body
24746 gitweb: Show combined diff for merge commits in 'commitdiff' view
24747 gitweb: Show combined diff for merge commits in 'commit' view
24750 SPECIFYING RANGES typo fix: it it => it is
24753 Documentation: don't reference non-existent 'git-cvsapplycommit'
24756 git-gui: Call changes "Staged" and "Unstaged" in file list titles.
24758 Junio C Hamano (10):
24759 diff: release blobs after generating textual diff.
24760 diff.c: do not use a separate "size cache".
24761 diff -M: release the preimage candidate blobs after rename detection.
24762 diff -S: release the image after looking for needle in it
24764 Update documentation links to point at 1.5.1.4
24765 t9400: skip cvsserver test if Perl SQLite interface is unavailable
24766 git-clone: don't get fooled by $PWD
24767 .mailmap: add some aliases
24771 Document git add -u introduced earlier.
24772 Added a reference to git-add in the documentation for git-update-index
24774 Michael Hendricks (1):
24775 Document 'git-log --decorate'
24778 dir.c: Omit non-excluded directories with dir->show_ignored
24779 t7300: Basic tests for git-clean
24780 Fix minor documentation errors
24782 Paul Mackerras (1):
24783 gitk: Allow user to choose whether to see the diff, old file, or new file
24786 Git.pm: config_boolean() -> config_bool()
24787 gitweb: Do not use absolute font sizes
24790 Add howto files to rpm packages.
24791 Added new git-gui library files to rpm spec
24793 Richard P. Curnow (2):
24794 Fix documentation of tag in git-fast-import.txt
24795 Fix documentation of tag in git-fast-import.txt
24797 Shawn O. Pearce (32):
24798 git-gui: Correctly handle UTF-8 encoded commit messages
24799 git-gui: Allow spaces in path to 'wish'
24800 git-gui: Include the subject in the status bar after commit
24801 git-gui: Warn users before making an octopus merge
24802 git-gui: Correct line wrapping for too many branch message
24803 git-gui: Cleanup common font handling for font_ui
24804 git-gui: Use option database defaults to set the font
24805 git-gui: Refactor to use our git proc more often
24806 git-gui: Track our own embedded values and rebuild when they change
24807 Properly handle '0' filenames in import-tars
24808 git-gui: Refactor into multiple files to save my sanity
24809 git-gui: Move console procs into their own namespace
24810 git-gui: Allow vi keys to scroll the diff/blame regions
24811 git-gui: Move merge support into a namespace
24812 git-gui: Show all possible branches for merge
24813 git-gui: Include commit id/subject in merge choices
24814 git-gui: Use vi-like keys in merge dialog
24815 Remove duplicate exports from Makefile
24816 git-gui: Allow shift-{k,j} to select a range of branches to merge
24817 git-gui: Define a simple class/method system
24818 git-gui: Convert browser, console to "class" format
24819 git-gui: Don't attempt to inline array reads in methods
24820 git-gui: Convert blame to the "class" way of doing things
24821 git-gui: Use prefix if blame is run in a subdirectory
24822 git-gui: Smarter command line parsing for browser, blame
24823 git-gui: Generate blame on uncommitted working tree file
24824 git-gui: Cleanup minor nits in blame code
24825 git-gui: Format author/committer times in ISO format
24826 Use .git/MERGE_MSG in cherry-pick/revert
24827 git-gui: Paperbag fix blame in subdirectory
24829 Correct error message in revert/cherry-pick
24832 Add pack.depth option to git-pack-objects.
24833 Increase pack.depth default to 50
24836 Version v1.5.2-rc2; changes since v1.5.2-rc1:
24837 ---------------------------------------------
24840 Small correction in reading of commit headers
24841 Handle return code of parse_commit in revision machinery
24843 Alexandre Julliard (1):
24844 http-fetch: Disable use of curl multi support for libcurl < 7.16.
24846 Arjen Laarhoven (1):
24847 Document 'opendiff' value in config.txt and git-mergetool.txt
24850 Allow PERL_PATH="/usr/bin/env perl"
24851 posix compatibility for t4200
24854 Mention version 1.5.1 in tutorial and user-manual
24857 Create pack-write.c for common pack writing code
24859 Daniel Barkalow (1):
24860 Make xstrndup common
24862 Frank Lichtenheld (1):
24863 cvsserver: Handle re-added files correctly
24865 Jakub Narebski (1):
24866 diff format documentation: describe raw combined diff format
24869 Documentation: fix typo in git-remote.txt
24871 Johannes Schindelin (1):
24872 Teach import-tars about GNU tar's @LongLink extension.
24875 git-tag(1): -v option is a subcommand; fix code block
24877 Junio C Hamano (6):
24878 blame: use .mailmap unconditionally
24879 diff.c: fix "size cache" handling.
24880 blame: Notice a wholesale incorporation of an existing file.
24882 Add test for blame corner cases.
24885 Karl Hasselström (2):
24886 Fix markup in git-svn man page
24887 Add --no-rebase option to git-svn dcommit
24889 Linus Torvalds (1):
24890 Fix --boundary output
24892 Martin Koegler (1):
24893 Fix compilation of test-delta
24895 Shawn O. Pearce (3):
24896 Reuse fixup_pack_header_footer in index-pack
24897 Don't use seq in tests, not everyone has it
24898 Improve request-pull to handle non-rebased branches
24901 gitweb: use decode_utf8 directly
24904 Version v1.5.2-rc1; changes since v1.5.2-rc0:
24905 ---------------------------------------------
24908 Remove usernames from all commit messages, not just when using svmprops
24909 git-svn: Don't rely on $_ after making a function call
24910 git-svn: Ignore usernames in URLs in find_by_url
24911 git-svn: Added 'find-rev' command
24912 git-svn: Add 'find-rev' command
24915 Fix handle leak in write_tree
24916 Avoid excessive rewrites in merge-recursive
24917 Add a test for merging changed and rename-changed branches
24918 Ignore merged status of the file-level merge
24919 Use strlcpy instead of strncpy in mailmap.c
24920 Fix read_mailmap to handle a caller uninterested in repo abbreviation
24921 Remove pointless calls to access(2) when checking for .mailmap
24922 Include mailmap.h in mailmap.c to catch mailmap interface changes
24925 Removing -n option from git-diff-files documentation
24926 Document additional options for git-fetch
24927 Update git-fmt-merge documentation
24928 Update git-grep documentation
24929 Update -L documentation for git-blame/git-annotate
24930 Update git-http-push documentation
24931 Update git-local-fetch documentation
24932 Update git-http-fetch documentation
24935 post-receive-email example hook: fastforward should have been fast_forward
24936 post-receive-email example hook: detect rewind-only updates and output sensible message
24937 post-receive-email example hook: sed command for getting description was wrong
24939 Brian Gernhardt (2):
24940 Reverse the order of -b and --track in the man page.
24941 Ignore all man sections as they are generated files.
24944 Documentation/git-reset.txt: suggest git commit --amend in example.
24947 Clarify SubmittingPatches Checklist
24948 git.7: Mention preformatted html doc location
24949 send-email documentation: clarify --smtp-server
24951 Johannes Schindelin (3):
24952 dir.c(common_prefix): Fix two bugs
24953 t4201: Do not display weird characters on the terminal
24954 import-tars: be nice to wrong directory modes
24957 Add clean.requireForce option, and add -f option to git-clean to override it
24958 Fix typo in git-am: s/Was is/Was it/
24959 Create a sysconfdir variable, and use it for ETC_GITCONFIG
24960 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
24961 Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
24963 Julian Phillips (1):
24964 http.c: Fix problem with repeated calls of http_init
24966 Junio C Hamano (25):
24967 Move index-related variables into a structure.
24968 Make read-cache.c "the_index" free.
24969 Document "diff=driver" attribute
24970 t5302: avoid using tail -c
24971 t6030: grab commit object name as we go
24972 Build RPM with ETC_GITCONFIG=/etc/gitconfig
24973 Diff between two blobs should take mode changes into account now.
24974 t/test-lib.sh: Protect ourselves from common misconfiguration that exports CDPATH to the environment
24975 gitattributes documentation: clarify overriding
24976 applymbox & quiltimport: typofix.
24977 Add 'ident' conversion.
24978 Add 'filter' attribute and external filter driver definition.
24979 Add --date={local,relative,default}
24980 Start preparing for 1.5.1.3
24981 Do not barf on too long action description
24982 Update .mailmap with "Michael"
24983 Fix import-tars fix.
24984 blame -s: suppress author name and time.
24985 Split out mailmap handling out of shortlog
24986 Apply mailmap in git-blame output.
24987 Make macros to prevent double-inclusion in headers consistent.
24988 Make sure test-genrandom and test-chmtime are builtas part of the main build.
24989 Fix symlink handling in git-svn, related to PerlIO
24993 Luiz Fernando N. Capitulino (5):
24994 remove_subtree(): Use strerror() when possible
24995 entry.c: Use const qualifier for 'struct checkout' parameters
24996 read_cache_from(): small simplification
24997 core-tutorial: minor fixes
24998 init_buffer(): Kill buf pointer
25000 Martin Koegler (5):
25001 Add S_IFINVALID mode
25002 add get_sha1_with_mode
25003 add add_object_array_with_mode
25004 store mode in rev_list, if <tree>:<filename> syntax is used
25005 use mode of the tree in git-diff, if <tree>:<file> syntax is used
25007 Michele Ballabio (1):
25008 git shortlog documentation: add long options and fix a typo
25011 add file checkout progress
25013 OGAWA Hirofumi (1):
25014 git-fetch: Fix "argument list too long"
25016 Robin H. Johnson (10):
25017 Document --dry-run parameter to send-email.
25018 Prefix Dry- to the message status to denote dry-runs.
25019 Debugging cleanup improvements
25020 Change the scope of the $cc variable as it is not needed outside of send_message.
25021 Perform correct quoting of recipient names.
25022 Validate @recipients before using it for sendmail and Net::SMTP.
25023 Ensure clean addresses are always used with Net::SMTP
25024 Allow users to optionally specify their envelope sender.
25025 Document --dry-run and envelope-sender for git-send-email.
25026 Sanitize @to recipients.
25029 fast-import: size_t vs ssize_t
25031 Shawn O. Pearce (4):
25032 Don't repack existing objects in fast-import
25033 Actually handle some-low memory conditions
25034 Don't allow empty pathnames in fast-import
25035 Catch empty pathnames in trees during fsck
25037 Uwe Kleine-König (1):
25038 fix importing of subversion tars
25041 Version v1.5.2-rc0; changes since v1.5.1.6:
25042 -------------------------------------------
25045 Fix passing of TCLTK_PATH to git-gui
25046 Fix t4201: accidental arithmetic expansion
25047 Fix permissions on test scripts
25048 Tests for core subproject support
25049 Simplify calling of CR/LF conversion routines
25050 Fix a typo in crlf conversion code
25051 Fix crash in t0020 (crlf conversion)
25053 Alexandre Julliard (1):
25054 git.el: Add a commit description to the reflog.
25057 Add policy on user-interface changes
25060 Show binary file size change in diff --stat
25062 Aneesh Kumar K.V (1):
25063 gitview: annotation support
25065 Brian Gernhardt (2):
25066 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
25067 Remove case-sensitive file in t3030-merge-recursive.
25069 Christian Couder (4):
25070 Bisect: teach "bisect start" to optionally use one bad and many good revs.
25071 Documentation: bisect: "start" accepts one bad and many good commits
25072 Bisect: simplify "bisect start" logging.
25073 Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
25076 git-svn: bail out on incorrect command-line options
25078 Eygene Ryabinkin (11):
25079 Add the WITH_P4IMPORT knob to the Makefile.
25080 Added git-p4 package to the list of git RPMs.
25081 Added correct Python path to the RPM specfile.
25083 Add --with-tcltk and --without-tcltk to configure.
25084 Rewrite Tcl/Tk interpreter path for the GUI tools.
25085 Eliminate checks of user-specified Tcl/Tk interpreter.
25086 Allow wish interpreter to be defined with TCLTK_PATH
25087 Teach git-gui to use the user-defined UI font everywhere.
25088 Improve look-and-feel of the git-gui tool.
25089 Do not break git-gui messages into multiple lines.
25091 Fernando J. Pereda (1):
25092 Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
25094 Frank Lichtenheld (16):
25095 cvsserver: Introduce new state variable 'method'
25096 cvsserver: Handle three part keys in git config correctly
25097 cvsserver: Allow to override the configuration per access method
25098 cvsserver: Make the database backend configurable
25099 cvsserver: Abort if connect to database fails
25100 Documentation: Replace @@GIT_VERSION@@ in documentation
25101 Documentation: Add version information to man pages
25102 cvsserver: Use DBI->table_info instead of DBI->tables
25103 cvsserver: Corrections to the database backend configuration
25104 cvsserver: Add asciidoc documentation for new database backend configuration
25105 gitweb: Allow forks with project list file
25106 gitweb: Allow configuring the default projects order and add order 'none'
25107 cvsserver: Allow to "add" a removed file
25108 cvsserver: Reword documentation on necessity of write access
25109 cvsserver: Document the GIT branches -> CVS modules mapping more prominently
25110 config.txt: Add gitcvs.db* variables
25112 Jakub Narebski (2):
25113 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
25114 gitweb: Quote hash keys, and do not use barewords keys
25117 Document git-check-attr
25120 sscanf/strtoul: parse integers robustly
25122 Johannes Schindelin (1):
25123 Use print_wrapped_text() in shortlog
25125 Julian Phillips (1):
25126 refs.c: add a function to sort a ref list, rather then sorting on add
25128 Junio C Hamano (83):
25129 git-fetch: add --quiet
25130 t6002: minor spelling fix.
25131 git-rev-list: add --bisect-vars option.
25132 git-rev-list --bisect: optimization
25133 t6004: add a bit more path optimization test.
25134 rev-list --bisect: Fix "halfway" optimization.
25135 make the previous optimization work also on path-limited rev-list --bisect
25136 Documentation: unbreak user-manual.
25137 Optional Tck/Tk: ignore generated files.
25138 checkout: allow detaching to HEAD even when switching to the tip of a branch
25139 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
25140 git-read-tree --index-output=<file>
25141 add_cache_entry(): removal of file foo does not conflict with foo/bar
25142 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
25143 unpack-trees: get rid of *indpos parameter.
25144 Fix read-tree --prefix=dir/.
25145 Fix twoway_merge that passed d/f conflict marker to merged_entry().
25146 Fix switching to a branch with D/F when current branch has file D.
25147 RPM spec: include git-p4 in the list of all packages.
25148 Fix bogus error message from merge-recursive error path
25149 Propagate cache error internal to refresh_cache() via parameter.
25150 Rename internal function "add_file_to_cache" in builtin-update-index.c
25151 Rename static variable write_index to update_index in builtin-apply.c
25152 Rename add_file_to_index() to add_file_to_cache()
25153 git-bisect: modernization
25154 t6030: add a bit more tests to git-bisect
25155 git-bisect: allow bisecting with only one bad commit.
25156 git-push reports the URL after failing.
25157 git-push to multiple locations does not stop at the first failure
25158 A new merge stragety 'subtree'.
25159 Start 1.5.2 cycle by prepareing RelNotes for it.
25160 shortlog -w: make wrap-line behaviour optional.
25161 t1000: fix case table.
25162 Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
25163 merge-recursive: do not barf on "to be removed" entries.
25164 merge-recursive: handle D/F conflict case more carefully.
25165 t3030: merge-recursive backend test.
25166 git-fetch--tool pick-rref
25167 git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
25168 Add %m to '--pretty=format:'
25169 Refactor patch-id filtering out of git-cherry and git-format-patch.
25170 git-log --cherry-pick A...B
25171 Documentation: --cherry-pick
25172 Fix git {log,show,...} --pretty=email
25173 Add basic infrastructure to assign attributes to paths
25174 Define 'crlf' attribute.
25175 Teach 'diff' about 'diff' attribute.
25176 Fix 'crlf' attribute semantics.
25177 Fix 'diff' attribute semantics.
25178 Makefile: add patch-ids.h back in.
25179 attribute macro support
25180 Define a built-in attribute macro "binary".
25181 Change attribute negation marker from '!' to '-'.
25182 send-email: do not leave an empty CC: line if no cc is present.
25183 Make sure quickfetch is not fooled with a previous, incomplete fetch.
25184 Allow more than true/false to attributes.
25185 merge-recursive: separate out xdl_merge() interface.
25186 git-gui: Honor TCLTK_PATH if supplied
25187 Allow specifying specialized merge-backend per path.
25188 Add a demonstration/test of customized merge.
25189 Update draft release notes for 1.5.2 with accumulated changes.
25190 Custom low-level merge driver support.
25191 Allow the default low-level merge driver to be configured.
25192 Custom low-level merge driver: change the configuration scheme.
25193 Allow low-level driver to specify different behaviour during internal merge.
25194 Fix funny types used in attribute value representation
25195 Counto-fix in merge-recursive
25196 Simplify code to find recursive merge driver.
25197 Documentation: support manual section (5) - file formats.
25198 Update 'crlf' attribute semantics.
25199 Document gitattributes(5)
25200 git-add -u: match the index with working tree.
25201 Fix bogus linked-list management for user defined merge drivers.
25202 convert.c: restructure the attribute checking part.
25203 lockfile: record the primary process.
25204 Update documentation links to point at v1.5.1.2
25205 Documentation/Makefile: fix section (5) installation
25206 Update draft release notes for v1.5.2
25207 pack-objects: quickfix for permission modes.
25208 Fix 'quickfix' on pack-objects.
25209 Update tests not to assume that generated packfiles are writable.
25210 pack-objects: make generated packfile read-only
25211 Support 'diff=pgm' attribute
25213 Linus Torvalds (24):
25214 Optimize directory listing with pathspec limiter.
25215 diff-lib: use ce_mode_from_stat() rather than messing with modes manually
25216 Avoid overflowing name buffer in deep directory structures
25217 Add 'resolve_gitlink_ref()' helper function
25218 Add "S_IFDIRLNK" file mode infrastructure for git links
25219 Teach "fsck" not to follow subproject links
25220 Teach core object handling functions about gitlinks
25221 Fix thinko in subproject entry sorting
25222 Teach directory traversal about subprojects
25223 Teach git-update-index about gitlinks
25224 Don't show gitlink directories when we want "other" files
25225 Teach git list-objects logic not to follow gitlinks
25226 Teach "git-read-tree -u" to check out submodules as a directory
25227 Fix gitlink index entry filesystem matching
25228 Teach git list-objects logic to not follow gitlinks
25229 Teach "git-read-tree -u" to check out submodules as a directory
25230 Fix some "git ls-files -o" fallout from gitlinks
25231 Expose subprojects as special files to "git diff" machinery
25232 Add a generic "object decorator" interface, and make object refs use it
25233 Add support for "commit name decorations" to log family of commands
25234 Use proper object allocators for unknown object nodes too
25235 Clean up object creation to use more common code
25236 Fix working directory errno handling when unlinking a directory
25237 Fix a copy-n-paste bug in the object decorator code.
25239 Luiz Fernando N. Capitulino (2):
25240 ident.c: Use const qualifier for 'struct passwd' parameters
25241 ident.c: Use size_t (instead of int) to store sizes
25243 Martin Koegler (1):
25244 gitweb: Show "no difference" message for empty diff
25246 Michael S. Tsirkin (1):
25247 Display the subject of the commit just made.
25249 Nicolas Pitre (32):
25250 clean up and optimize nth_packed_object_sha1() usage
25251 get rid of num_packed_objects()
25252 make overflow test on delta base offset work regardless of variable size
25253 add overflow tests on pack offset variables
25254 compute a CRC32 for each object as stored in a pack
25255 compute object CRC32 with index-pack
25256 pack-objects: learn about pack index version 2
25257 index-pack: learn about pack index version 2
25258 sha1_file.c: learn about index version 2
25259 show-index.c: learn about index v2
25260 pack-redundant.c: learn about index v2
25261 allow forcing index v2 and 64-bit offset treshold
25262 validate reused pack data with CRC when possible
25263 simple random data generator for tests
25264 use test-genrandom in tests instead of /dev/urandom
25265 tests for various pack index features
25266 clean up add_object_entry()
25267 pack-objects: optimize preferred base handling a bit
25268 pack-objects: equal objects in size should delta against newer objects
25269 pack-objects: rework check_delta_limit usage
25270 pack-objects: clean up list sorting
25271 pack-objects: get rid of reuse_cached_pack
25272 pack-objects: get rid of create_final_object_list()
25273 pack-objects: make in_pack_header_size a variable of its own
25274 add get_size_from_delta()
25275 pack-objects: better check_object() performances
25276 pack-objects: remove obsolete comments
25277 document --index-version for index-pack and pack-objects
25278 common progress display support
25279 make progress "title" part of the common progress interface
25280 provide a facility for "delayed" progress reporting
25281 delay progress display when checking out files
25284 git-archive: make tar the default format
25286 Robin H. Johnson (2):
25287 Add custom subject prefix support to format-patch (take 3)
25288 Add testcase for format-patch --subject-prefix (take 3)
25290 Shawn O. Pearce (8):
25291 Always bind the return key to the default button
25292 Fix lost-found to show commits only referenced by reflogs
25293 Don't yap about merge-subtree during make
25294 git-gui: Display the directory basename in the title
25295 Revert "Allow wish interpreter to be defined with TCLTK_PATH"
25296 Contribute a fairly paranoid update hook
25297 Kill the useless progress meter in merge-recursive
25298 Cleanup variables in cat-file
25301 Add --quiet option to suppress output of "rm" commands for removed files.
25302 git-rm: Trivial fix for a comment typo.
25303 Add --ignore-unmatch option to exit with zero status when no files are removed.
25305 Xavier Maillard (2):
25306 git-blame.el: separate git-blame-mode to ease maintenance
25307 git-blame.el: pick a set of random colors for each git-blame turn
25310 Version v1.5.1.6; changes since v1.5.1.5:
25311 -----------------------------------------
25314 git-svn: avoid crashing svnserve when creating new directories
25315 git-svn: don't minimize-url when doing an init that tracks multiple paths
25317 J. Bruce Fields (4):
25318 tutorials: add user-manual links
25319 tutorial: revise index introduction
25320 user-manual: discourage shared repository
25321 user-manual: finding commits referencing given file content
25324 user-manual: Add section on ignoring files
25326 Junio C Hamano (1):
25329 Matthias Kestenholz (2):
25330 Documentation: Added [verse] to SYNOPSIS where necessary
25331 Documentation: Reformatted SYNOPSIS for several commands
25334 Version v1.5.1.5; changes since v1.5.1.4:
25335 -----------------------------------------
25338 Allow fetching references from any namespace
25340 Andy Whitcroft (1):
25341 git name-rev writes beyond the end of malloc() with large generations
25344 git-svn: don't drop the username from URLs when dcommit is run
25345 git-svn: clean up caching of SVN::Ra functions
25346 git-svn: fix segfaults due to initial SVN pool being cleared
25347 git-svn: don't attempt to minimize URLs by default
25349 Frank Lichtenheld (3):
25350 builtin-log.c: Fix typo in comment
25351 Documentation: format-patch has no --mbox option
25352 git-am: Clean up the asciidoc documentation
25354 J. Bruce Fields (10):
25355 user-manual: revise birdseye-view chapter
25356 glossary: expand and clarify some definitions, prune cross-references
25357 user-manual: move quick-start to an appendix
25358 Documentation: remove howto's now incorporated into manual
25359 user-manual: move howto/make-dist.txt into user manual
25360 user-manual: move howto/using-topic-branches into manual
25361 user-manual: add a "counting commits" example
25362 user-manual: introduce git
25363 user-manual: listing commits reachable from some refs not others
25364 user-manual: reorganize public git repo discussion
25366 Jakub Narebski (1):
25367 gitweb: Add a few comments about %feature hash
25370 Updated documentation of hooks in git-receive-pack.
25373 SPECIFYING RANGES typo fix: it it => it is
25376 format-patch: add MIME-Version header when we add content-type.
25378 Johannes Schindelin (2):
25379 import-tars: Use the "Link indicator" to identify directories
25380 Add a birdview-on-the-source-code section to the user manual
25382 Junio C Hamano (7):
25383 git-clone: don't get fooled by $PWD
25384 .mailmap: add some aliases
25385 checkout: allow detaching to HEAD even when switching to the tip of a branch
25386 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
25387 Fix git-clone buglet for remote case.
25388 Prepare for 1.5.1.5 Release Notes
25391 Marco Costalba (1):
25392 Fix an unmatched comment end in arm/sha1_arm.S
25394 Matthieu Castet (1):
25395 Remove stale non-static-inline prototype for tree_entry_extract()
25397 Michael Hendricks (2):
25398 git-send-email: allow leading white space on mutt aliases
25399 Document core.excludesfile for git-add
25402 Documentation: git-rev-list's "patterns"
25405 RPM spec: include files in technical/ to package.
25406 Documentation/branch: fix small typo in -D example
25408 Richard P. Curnow (2):
25409 Fix documentation of tag in git-fast-import.txt
25410 Fix documentation of tag in git-fast-import.txt
25412 Shawn O. Pearce (1):
25413 Properly handle '0' filenames in import-tars
25415 Steffen Prohaska (3):
25416 tiny fix in documentation of git-clone
25417 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
25418 Fixed link in user-manual
25421 Version v1.5.1.4; changes since v1.5.1.3:
25422 -----------------------------------------
25425 Small correction in reading of commit headers
25427 Alexandre Julliard (1):
25428 http-fetch: Disable use of curl multi support for libcurl < 7.16.
25430 Amos Waterland (1):
25431 wcwidth redeclaration
25433 Arjen Laarhoven (1):
25434 Document 'opendiff' value in config.txt and git-mergetool.txt
25437 Allow PERL_PATH="/usr/bin/env perl"
25438 posix compatibility for t4200
25441 Mention version 1.5.1 in tutorial and user-manual
25443 Daniel Barkalow (1):
25444 Make xstrndup common
25446 Frank Lichtenheld (1):
25447 cvsserver: Handle re-added files correctly
25449 J. Bruce Fields (7):
25450 user-manual: more discussion of detached heads, fix typos
25451 user-manual: add section ID's
25452 user-manual: clean up fast-forward and dangling-objects sections
25453 user-manual: fix .gitconfig editing examples
25454 user-manual: miscellaneous editing
25455 user-manual: stop deprecating the manual
25456 user-manual: fix clone and fetch typos
25458 Jakub Narebski (1):
25459 diff format documentation: describe raw combined diff format
25462 Documentation: fix typo in git-remote.txt
25465 Documentation: don't reference non-existent 'git-cvsapplycommit'
25467 Johannes Schindelin (1):
25468 Teach import-tars about GNU tar's @LongLink extension.
25470 Junio C Hamano (5):
25471 diff.c: fix "size cache" handling.
25472 blame: Notice a wholesale incorporation of an existing file.
25474 Add test for blame corner cases.
25477 Karl Hasselström (2):
25478 Fix markup in git-svn man page
25479 Add --no-rebase option to git-svn dcommit
25481 Linus Torvalds (1):
25482 Fix --boundary output
25484 Martin Koegler (1):
25485 Fix compilation of test-delta
25487 Paul Mackerras (1):
25488 gitk: Allow user to choose whether to see the diff, old file, or new file
25491 Add howto files to rpm packages.
25493 Shawn O. Pearce (1):
25494 git-gui: Allow spaces in path to 'wish'
25497 gitweb: use decode_utf8 directly
25500 Version v1.5.1.3; changes since v1.5.1.2:
25501 -----------------------------------------
25504 Remove usernames from all commit messages, not just when using svmprops
25505 git-svn: Don't rely on $_ after making a function call
25506 git-svn: Ignore usernames in URLs in find_by_url
25507 git-svn: Added 'find-rev' command
25508 git-svn: Add 'find-rev' command
25511 Fix handle leak in write_tree
25514 Removing -n option from git-diff-files documentation
25515 Document additional options for git-fetch
25516 Update git-fmt-merge documentation
25517 Update git-grep documentation
25518 Update -L documentation for git-blame/git-annotate
25519 Update git-http-push documentation
25520 Update git-local-fetch documentation
25521 Update git-http-fetch documentation
25523 Brian Gernhardt (2):
25524 Reverse the order of -b and --track in the man page.
25525 Ignore all man sections as they are generated files.
25528 Documentation/git-reset.txt: suggest git commit --amend in example.
25531 Clarify SubmittingPatches Checklist
25532 git.7: Mention preformatted html doc location
25533 send-email documentation: clarify --smtp-server
25535 Johannes Schindelin (2):
25536 dir.c(common_prefix): Fix two bugs
25537 import-tars: be nice to wrong directory modes
25540 Fix typo in git-am: s/Was is/Was it/
25541 Create a sysconfdir variable, and use it for ETC_GITCONFIG
25542 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
25544 Julian Phillips (1):
25545 http.c: Fix problem with repeated calls of http_init
25547 Junio C Hamano (8):
25548 Build RPM with ETC_GITCONFIG=/etc/gitconfig
25549 applymbox & quiltimport: typofix.
25550 Start preparing for 1.5.1.3
25551 Do not barf on too long action description
25552 Update .mailmap with "Michael"
25553 Fix import-tars fix.
25554 Fix symlink handling in git-svn, related to PerlIO
25557 Michele Ballabio (1):
25558 git shortlog documentation: add long options and fix a typo
25560 Robin H. Johnson (10):
25561 Document --dry-run parameter to send-email.
25562 Prefix Dry- to the message status to denote dry-runs.
25563 Debugging cleanup improvements
25564 Change the scope of the $cc variable as it is not needed outside of send_message.
25565 Perform correct quoting of recipient names.
25566 Validate @recipients before using it for sendmail and Net::SMTP.
25567 Ensure clean addresses are always used with Net::SMTP
25568 Allow users to optionally specify their envelope sender.
25569 Document --dry-run and envelope-sender for git-send-email.
25570 Sanitize @to recipients.
25572 Shawn O. Pearce (3):
25573 Actually handle some-low memory conditions
25574 Don't allow empty pathnames in fast-import
25575 Catch empty pathnames in trees during fsck
25578 Version v1.5.1.2; changes since v1.5.1.1:
25579 -----------------------------------------
25582 Use rev-list --reverse in git-rebase.sh
25583 Document -g (--walk-reflogs) option of git-log
25584 Fix overwriting of files when applying contextually independent diffs
25587 Update git-am documentation
25588 Update git-applymbox documentation
25589 Update git-apply documentation
25590 Update git-annotate/git-blame documentation
25591 Update git-archive documentation
25592 Update git-cherry-pick documentation
25593 Fix unmatched emphasis tag in git-tutorial
25594 Update git-config documentation
25596 Andy Whitcroft (1):
25597 fix up strtoul_ui error handling
25600 Use const qualifier for 'sha1' parameter in delete_ref function
25603 git-svn: respect lower bound of -r/--revision when following parent
25604 git-svn: quiet some warnings when run only with --version/--help
25605 git-svn: don't allow globs to match regular files
25606 perl: install private Error.pm if the site version is older than our own
25608 Eygene Ryabinkin (2):
25609 Teach gitk to use the user-defined UI font everywhere.
25610 Improve look-and-feel of the gitk tool.
25612 Frank Lichtenheld (5):
25613 config.txt: Document gitcvs.allbinary
25614 config.txt: Document core.autocrlf
25615 config.txt: Change pserver to server in description of gitcvs.*
25616 config.txt: Fix grammatical error in description of http.noEPSV
25617 git-shortlog: Fix two formatting errors in asciidoc documentation
25620 variable $projectdesc needs to be set before checking against unchanged default.
25621 Have sample update hook not refuse deleting a branch through push.
25623 J. Bruce Fields (7):
25624 Documentation: minor edits of git-lost-found manpage
25625 Documentation: clarify git-checkout -f, minor editing
25626 Documentation: clarify track/no-track option.
25627 user-manual: fix discussion of default clone
25628 user-manual: detached HEAD
25629 user-manual: start revising "internals" chapter
25630 user-manual: use detached head when rewriting history
25633 sscanf/strtoul: parse integers robustly
25635 Junio C Hamano (4):
25636 Do not default to --no-index when given two directories.
25637 Start preparing for 1.5.1.2
25638 git-clone: fix dumb protocol transport to clone from pack-pruned ref
25641 Linus Torvalds (1):
25642 git-quiltimport complaining yet still working
25644 Matthias Lederhofer (1):
25645 handle_options in git wrapper miscounts the options it handled.
25648 git-blame: Fix overrun in fake_working_tree_commit()
25651 git-tar-tree: complete deprecation conversion message
25653 Shawn O. Pearce (1):
25654 git-gui: Brown paper bag fix division by 0 in blame
25657 Version v1.5.1.1; changes since v1.5.1:
25658 ---------------------------------------
25660 Arjen Laarhoven (4):
25661 usermanual.txt: some capitalization nits
25662 t3200-branch.sh: small language nit
25663 t5300-pack-object.sh: portability issue using /usr/bin/stat
25664 Makefile: iconv() on Darwin has the old interface
25666 Brian Gernhardt (3):
25667 Fix t4200-rerere for white-space from "wc -l"
25668 Document --left-right option to rev-list.
25669 Distinguish branches by more than case in tests.
25672 Fix lseek(2) calls with args 2 and 3 swapped
25675 git-svn: bail out on incorrect command-line options
25676 git-svn: dcommit/rebase confused by patches with git-svn-id: lines
25677 git-svn: fix log command to avoid infinite loop on long commit messages
25679 Frank Lichtenheld (7):
25680 cvsimport: sync usage lines with existing options
25681 cvsimport: Improve documentation of CVSROOT and CVS module determination
25682 cvsimport: Improve usage error reporting
25683 cvsimport: Reorder options in documentation for better understanding
25684 cvsimport: Improve formating consistency
25685 cvsserver: small corrections to asciidoc documentation
25686 cvsserver: Fix handling of diappeared files on update
25689 Fix renaming branch without config file
25692 rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
25694 Jakub Narebski (1):
25695 gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
25698 (encode_85, decode_85): Mark source buffer pointer as "const".
25700 Julian Phillips (1):
25701 Documentation: show-ref: document --exclude-existing
25703 Junio C Hamano (7):
25704 rerere: make sorting really stable.
25705 Fix dependency of common-cmds.h
25706 Documentation: tighten dependency for git.{html,txt}
25707 Prepare for 1.5.1.1
25708 Add Documentation/cmd-list.made to .gitignore
25709 fsck: do not complain on detached HEAD.
25713 rename_ref(): only print a warning when config-file update fails
25714 Make builtin-branch.c handle the git config file
25717 Revert "builtin-archive: use RUN_SETUP"
25719 Shawn O. Pearce (1):
25720 Honor -p<n> when applying git diffs
25722 Tomash Brechko (1):
25723 cvsexportcommit -p : fix the usage of git-apply -C.
25726 DESTDIR support for git/contrib/emacs
25728 YOSHIFUJI Hideaki (1):
25729 Avoid composing too long "References" header.
25732 Version v1.5.1; changes since v1.5.1-rc3:
25733 -----------------------------------------
25736 Keep rename/rename conflicts of intermediate merges while doing recursive merge
25739 Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
25741 Christian Couder (1):
25742 Bisect: Improve error message in "bisect_next_check".
25745 git-mailinfo fixes for patch munging
25748 git-svn: avoid respewing similar error messages for missing paths
25749 git-svn: fail on rebase if we are unable to find a ref to rebase against
25752 git-quiltimport /bin/sh-ism fix
25754 Frank Lichtenheld (1):
25755 cvsserver: Don't lie about binary mode in asciidoc documentation
25758 Documentation/git-svnimport.txt: fix typo.
25759 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
25761 H. Peter Anvin (1):
25762 git-upload-pack: make sure we close unused pipe ends
25764 Jakub Narebski (2):
25765 gitweb: Support comparing blobs (files) with different names
25766 Documentation: A few minor fixes to Git User's Manual
25768 Julian Phillips (1):
25769 contrib/workdir: add a simple script to create a working directory
25771 Junio C Hamano (6):
25772 Update draft release notes for 1.5.1
25773 Do not bother documenting fetch--tool
25774 Hopefully final update to the draft Release Notes, preparing for 1.5.1
25775 rerere should not repeat the earlier hunks in later ones
25780 Plug memory leak in index-pack collision checking codepath.
25782 Theodore Ts'o (12):
25783 Fix minor formatting issue in man page for git-mergetool
25784 mergetool: Replace use of "echo -n" with printf(1) to be more portable
25785 mergetool: Don't error out in the merge case where the local file is deleted
25786 mergetool: portability fix: don't assume true is in /bin
25787 mergetool: portability fix: don't use reserved word function
25788 mergetool: factor out common code
25789 mergetool: Remove spurious error message if merge.tool config option not set
25790 mergetool: Fix abort command when resolving symlinks and deleted files
25791 mergetool: Add support for Apple Mac OS X's opendiff command
25792 mergetool: Make git-rm quiet when resolving a deleted file conflict
25793 mergetool: Clean up description of files and prompts for merge resolutions
25794 Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
25797 Version v1.5.1-rc3; changes since v1.5.1-rc2:
25798 ---------------------------------------------
25800 Alexandre Julliard (1):
25801 git.el: Display some information about the HEAD commit.
25803 Christian Couder (2):
25804 Bisect: Use "git-show-ref --verify" when reseting.
25805 Bisect: add checks at the beginning of "git bisect run".
25808 Makefile: remove test-chmtime program in target clean.
25809 http-fetch: don't use double-slash as directory separator in URLs
25810 http-fetch: remove path_len from struct alt_base, it was computed but never used
25812 H. Peter Anvin (1):
25813 git-upload-pack: make sure we close unused pipe ends
25815 Jakub Narebski (2):
25816 gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL
25817 gitweb: Cleanup and uniquify die_error calls
25820 read-tree: use xcalloc
25821 use xrealloc in help.c
25824 git-rm: don't remove newly added file without -f
25825 --pretty=format: fix broken %ct and %at interpolation
25826 Add some basic tests of rev-list --pretty=format
25827 Fix "--pretty=format:" encoding item
25828 t/t6006: add tests for a slightly more complex commit messages
25829 commit: fix pretty-printing of messages with "\nencoding "
25832 sha1_file.c (write_sha1_from_fd): Detect close failure.
25834 Johannes Schindelin (1):
25835 t4118: be nice to non-GNU sed
25837 Junio C Hamano (7):
25838 Document git-log --first-parent
25839 sha1_file.c (write_sha1_file): Detect close failure
25840 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
25841 Fix "--pretty=format:" for parent related items.
25843 Update main git.html page to point at 1.5.0.6 documentation
25846 Linus Torvalds (1):
25847 Fix "getaddrinfo()" buglet
25850 Version v1.5.1-rc2; changes since v1.5.1-rc1:
25851 ---------------------------------------------
25854 Document --quiet option to git-diff
25855 Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
25858 update-hook: abort early if the project description is unset
25859 update-hook: remove e-mail sending hook.
25862 prefer "git COMMAND" over "git-COMMAND" in gitk
25865 make git clone -q suppress the noise with http fetch
25867 Christian Couder (6):
25868 Bisect: implement "git bisect run <cmd>..." to automatically bisect.
25869 Documentation: bisect: reformat some paragraphs.
25870 Documentation: bisect: reword one paragraph.
25871 Documentation: bisect: reformat more paragraphs.
25872 Documentation: bisect: add some titles to some paragraphs.
25873 Documentation: bisect: make a comment fit better in the man page.
25876 gitk: bind <F5> key to Update (reread commits)
25877 git-svn: fix rel_path() when not connected to the repository root
25879 J. Bruce Fields (5):
25880 user-manual: run xsltproc without --nonet option
25881 user-manual: Use def_ instead of ref_ for glossary references.
25882 glossary: stop generating automatically
25883 glossary: clean up cross-references
25884 user-manual: introduce "branch" and "branch head" differently
25886 Jakub Narebski (4):
25887 gitweb: Fix "next" link in commit view
25888 gitweb: Don't escape attributes in CGI.pm HTML methods
25889 gitweb: Fix not marking signoff lines in "log" view
25890 gitweb: Add some installation notes in gitweb/INSTALL
25893 Replace remaining instances of strdup with xstrdup.
25894 use xmalloc in git.c and help.c
25897 user-manual.txt: fix a tiny typo.
25899 Johannes Schindelin (5):
25900 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
25901 Add a HOWTO for setting up a standalone git daemon
25902 Provide some technical documentation for shallow clones
25903 t4118: be nice to non-GNU sed
25904 git-revert: Revert revert message to old behaviour
25907 Teach git-remote to list pushed branches.
25909 Junio C Hamano (15):
25910 git-log --first-parent: show only the first parent log
25911 blame: micro-optimize cmp_suspect()
25912 blame: cmp_suspect is not "cmp" anymore.
25913 Teach tree_entry_interesting() that the tree entries are sorted.
25914 tree-diff: avoid strncmp()
25915 tree_entry_interesting(): allow it to say "everything is interesting"
25916 git-rebase: make 'rebase HEAD branch' work as expected.
25917 git-apply: Do not free the wrong buffer when we convert the data for writeout
25918 checkout: report where the new HEAD is upon detaching HEAD
25919 git-bisect: typofix
25920 git-bisect.sh: properly dq $GIT_DIR
25921 Fix path-limited "rev-list --bisect" termination condition.
25922 git-am documentation: describe what is taken from where.
25923 Update README to point at a few key periodical messages to the list
25927 gitweb: Change to use explicitly function call cgi->escapHTML()
25929 Linus Torvalds (6):
25930 Fix loose object uncompression check.
25931 Don't ever return corrupt objects from "parse_object()"
25932 Be more careful about zlib return values
25933 Remove "pathlen" from "struct name_entry"
25934 Initialize tree descriptors with a helper function rather than by hand.
25935 Switch over tree descriptors to contain a pre-parsed entry
25937 Michael S. Tsirkin (2):
25938 fix typo in git-am manpage
25939 git-merge: Put FETCH_HEAD data in merge commit message
25941 Nicolas Pitre (10):
25942 clean up the delta base cache size a bit
25943 use a LRU eviction policy for the delta base cache
25944 don't ever allow SHA1 collisions to exist by fetching a pack
25945 index-pack: use hash_sha1_file()
25946 index-pack: more validation checks and cleanups
25947 improve checkout message when asking for same branch
25948 minor git-prune optimization
25949 update HEAD reflog when branch pointed to by HEAD is directly modified
25950 make it more obvious that temporary files are temporary files
25951 write_sha1_from_fd() should make new objects read-only
25954 Documentation/pack-format.txt: Clear up description of types.
25957 git-fetch: Fix single_force in append_fetch_head
25959 Shawn O. Pearce (1):
25960 contrib/continuous: a continuous integration build manager
25962 Uwe Kleine-König (1):
25963 Bisect: convert revs given to good and bad to commits
25966 Version v1.5.1-rc1; changes since v1.5.0.7:
25967 -------------------------------------------
25970 disable t4016-diff-quote.sh on some filesystems
25971 git-gui: Support of "make -s" in: do not output anything of the build itself
25972 More build output cleaning up
25973 Support of "make -s": do not output anything of the build itself
25974 Allow "make -w" generate its usual output
25975 Allow git-diff exit with codes similar to diff(1)
25976 Add tests for --quiet option of diff programs
25978 Alexandre Julliard (1):
25979 git.el: Add support for commit hooks.
25982 Only show log entries for new revisions in hooks--update
25983 Have git-cvsserver call hooks/update before really altering the ref
25984 The "table-of-contents" in the update hook script should match the body
25985 cvsserver: Remove trailing "\n" from commithash in checkin function
25986 cvsserver: Make always-binary mode a config file option
25987 Sample update hook: typofix and modernization to use "git log"
25988 update-hook: fix incorrect use of git-describe and sed for finding previous tag
25990 Aneesh Kumar K.V (1):
25991 Documentation: document remote.<name>.tagopt
25994 git-send-email: configurable bcc and chain-reply-to
25997 builtin-mailinfo.c infrastrcture changes
25998 restrict the patch filtering
25999 Add a couple more test cases to the suite.
26002 git-svn: move authentication prompts into their own namespace
26003 git-svn: cleanup: move process_rm around
26004 git-svn: cleanup: put SVN workarounds into their own namespace
26005 git-svn: cleanup: avoid re-use()ing Git.pm in sub-packages
26006 git-svn: add Git::SVN module (to avoid global variables)
26007 git-svn: convert 'init' to use Git::SVN
26008 git-svn: convert multi-init over to using Git::SVN
26009 git-svn: make multi-init capable of reusing the Ra connection
26010 git-svn: add a test for show-ignore
26011 git-svn: convert show-ignore over to Git::SVN
26012 git-svn: moved the 'log' command into its own namespace
26013 git-svn: port the 'rebuild' command to use Git::SVN objects
26014 git-svn: do not let Git.pm warn if we prematurely close pipes
26015 git-svn: convert the 'commit-diff' command to Git::SVN
26016 git-svn: get rid of Memoize for now...
26017 git-svn: fetch/multi-fetch converted over to Git::SVN module
26018 git-svn: switch dcommit to using Git::SVN code
26019 git-svn: convert 'set-tree' command to use Git::SVN
26020 git-svn: remove graft-branches command
26021 git-svn: add support for metadata in .git/config
26022 git-svn: fix a regression in dcommit that caused empty log messages
26023 git-svn: reuse open SVN::Ra connections by URL
26024 git-svn: enable --minimize to simplify the config and connections
26025 git-svn: fix --follow-parent to work with Git::SVN
26026 git-svn: --follow-parent works with svn-remotes multiple branches
26027 git-svn: disallow ambigious local refspecs
26028 git-svn: allow --follow-parent on deleted directories
26029 git-svn: get rid of additional fetch-arguments
26030 git-svn: allow 'init' to work outside of tests
26031 git-svn: better error reporting if --follow-parent fails
26032 git-svn: 'init' attempts to connect to the repository root if possible
26033 git-svn: --follow-parent now works on sub-directories of larger branches
26034 git-svn: track writes writes to the index in fetch
26035 git-svn: add an odd test case that seems to cause segfaults over HTTP
26036 git-svn: avoid tracking change-less revisions
26037 git-svn: correctly track revisions made to deleted branches
26038 git-svn: fix segfaults from accessing svn_log_changed_path_t
26039 git-svn: fix committing to subdirectories, add tests
26040 git-svn: avoid an extra svn_ra connection during commits
26041 git-svn: simplify usage of the SVN::Git::Editor interface
26042 git-svn: cleanup remove unused function
26043 git-svn: allow multi-fetch to fetch things chronologically
26044 git-svn: correctly track diff-less copies with do_switch
26045 git-svn: correctly handle do_{switch,update} in deep directories
26046 git-svn: stop using path names as refnames with --follow-parent
26047 git-svn: cleanup: move editor-specific variables into the editor namespace
26048 git-svn: just use Digest::MD5 instead of requiring it
26049 git-svn: reinstate the default SVN error handler after using get_log
26050 git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
26051 git-svn: fetch tracks initial change with --follow-parent
26052 git-svn: remove the 'rebuild' command and make the functionality automatic
26053 git-svn: fix several fetch bugs related to repeated invocations
26054 git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
26055 git-svn: gracefully handle --follow-parent failures
26056 git-svn: make (multi-)fetch safer but slower
26057 git-svn: avoid a huge memory spike with high-numbered revisions
26058 git-svn: re-enable repacking flags
26059 git-svn: do our best to ensure that our ref and rev_db are consistent
26060 git-svn: avoid redundant get_log calls between invocations
26061 git-svn: use sys* IO functions for reading rev_db
26062 git-svn: don't write to the config file from --follow-parent
26063 git-svn: save paths to tags/branches with for future reuse
26064 git-svn: migrations default to [svn-remote "git-svn"]
26065 git-svn: get rid of revisions_eq check for --follow-parent
26066 git-svn: avoid extra get_log calls when refspecs are added for fetching
26067 git-svn: just name the default svn-remote "svn" instead of "git-svn"
26068 git-svn: prepare multi-init for wildcard support
26069 git-svn: reintroduce using a single get_log() to fetch
26070 git-svn: run get_log() on a sub-directory if possible
26071 git-svn: implement auto-discovery of branches/tags
26072 git-svn: --follow-parent tracks multi-parent paths
26073 git-svn: remove check_path calls before calling do_update
26074 git-svn: remove some noisy debugging messages
26075 git-svn: enable follow-parent functionality by default
26076 git-svn: fix buggy regular expression usage in several places
26077 git-svn: correctly handle the -q flag in SVN::Git::Fetcher
26078 git-svn: correctly handle globs with a right-hand-side path component
26079 git-svn: remove optimized commit stuff for set-tree
26080 git-svn: add support for SVN::Mirror/svk using revprops for metadata
26081 git-svn: add support for per-[svn-remote "..."] options
26082 git-svn: use private $GIT_DIR/svn/config file more
26083 git-svn: extra safety for noMetadata and useSvmProps users
26084 git-svn: use separate, per-repository .rev_db files
26085 git-svn: write the highest maxRex out for branches and tags
26086 git-svn: handle multi-init without --trunk, UseSvmProps fixes
26087 git-svn: make dcommit usable for glob users
26088 git-svn: include merges when calling rev-list for decommit
26089 git-svn: usability fixes for the 'git svn log' command
26090 t910*: s/repo-config/config/g; poke around possible race conditions
26091 git-svn: hopefully make 'fetch' more user-friendly
26092 git-svn: allow 'init' to act as multi-init
26093 git-svn: brown paper bag fixes
26094 git-svn: simplify the (multi-)init methods of fetching
26095 git-svn: allow --log-window-size to be specified, default to 100
26096 git-svn: remember to check for clean indices on globbed refs, too
26097 git-svn: error checking for invalid [svn-remote "..."] sections
26098 git-svn: allow dcommit for those who only fetch from SVM with useSvmProps
26099 git-svn: documentation updates for new functionality
26100 git-svn: add support for --stat in the log command
26101 git-svn: checkout files on new fetches
26102 git-svn: add a 'rebase' command
26103 git-svn: fix some issues for people migrating from older versions
26104 git-svn: hide the private git-svn 'config' file as '.metadata'
26105 git-svn: add 'clone' command, an alias for init + fetch
26106 git-svn: allow overriding of the SVN repo root in metadata
26107 git-svn: add support for using svnsync properties
26108 git-svn: fix useSvmProps, hopefully for the last time
26109 git-svn: add test for useSvnsyncProps
26110 git-svn: documentation updates
26111 git-svn: allow metadata options to be specified with 'init' and 'clone'
26112 git-svn: give show-ignore HEAD smarts, like dcommit and log
26113 git-svn: ensure we're at the top-level and can access $GIT_DIR
26114 git-svn: fix clone when a target directory has been specified
26115 git-svn: fix reconnections to different paths of svn:// repositories
26116 git-svn: fix some potential bugs with --follow-parent
26117 Add test-chmtime: a utility to change mtime on files
26118 Update tests to use test-chmtime
26119 git-svn: fix show-ignore when not connected to the repository root
26120 git-svn: add -l/--local command to "git svn rebase"
26122 Frank Lichtenheld (3):
26123 cvsserver: Use Merged response instead of Update-existing for merged files
26124 cvsserver: Be more chatty
26125 cvsserver: further improve messages on commit and status
26127 Fredrik Kuivinen (1):
26128 New autoconf test for iconv
26130 J. Bruce Fields (1):
26131 Make git-send-email aware of Cc: lines.
26133 Jakub Narebski (1):
26134 gitweb: Don't escape attributes in CGI.pm HTML methods
26137 add: Support specifying an excludes file with a configuration variable
26139 mergetool: Add support for vimdiff.
26142 New fast-import test case for valid tree sorting
26145 I like the idea of the new ':/<oneline prefix>' notation, and gave it a try, but all I could get was a segfault. It was dereferencing a NULL commit list. Fix below. With it, this example now works:
26146 git-grep: don't use sscanf
26148 Johannes Schindelin (42):
26149 Teach revision machinery about --reverse
26150 teach diff machinery about --ignore-space-at-eol
26151 name-rev: introduce the --refs=<pattern> option
26152 diff --check: use colour
26153 apply: fix memory leak in prefix_one()
26154 name-rev: avoid "^0" when unneeded
26155 rev-list --max-age, --max-count: support --boundary
26156 fetch & clone: do not output progress when not on a tty
26157 config: read system-wide defaults from /etc/gitconfig
26158 git grep: use pager
26159 Teach diff -B about colours
26160 apply: make --verbose a little more useful
26161 Teach git-diff-files the new option `--no-index`
26162 pretty-formats: add 'format:<string>'
26163 Make tests independent of global config files
26164 Add git-bundle: move objects and references by archive
26165 git-bundle: assorted fixes
26166 git-bundle: avoid fork() in verify_bundle()
26167 git-bundle: fix 'create --all'
26168 git-bundle: record commit summary in the prerequisite data
26169 Fixup no-progress for fetch & clone
26170 object name: introduce ':/<oneline prefix>' notation
26171 Fix typo: do not show name1 when name2 fails
26172 diff --no-index: also imitate the exit status of diff(1)
26173 Actually make print_wrapped_text() useful
26174 show_date(): rename the "relative" parameter to "mode"
26175 diff: make more cases implicit --no-index
26176 print_wrapped_text: fix output for negative indent
26177 Make git-revert & git-cherry-pick a builtin
26178 diff: support reading a file from stdin via "-"
26179 diff --no-index: support /dev/null as filename
26180 Get rid of the dependency to GNU diff in the tests
26181 cherry-pick: Suggest a better method to retain authorship
26182 format-patch: add --inline option and make --attach a true attachment
26183 bundle: fix wrong check of read_header()'s return value & add tests
26184 git-bundle: avoid packing objects which are in the prerequisites
26185 git-bundle: Make thin packs
26186 git-bundle: handle thin packs in subcommand "unbundle"
26187 git-bundle: die if a given ref is not included in bundle
26188 git-bundle: prevent overwriting existing bundles
26189 git-bundle: only die if pack would be empty, warn if ref is skipped
26190 Do not output "GEN " when generating perl.mak
26193 Add core.symlinks to mark filesystems that do not support symbolic links.
26194 Handle core.symlinks=false case in merge-recursive.
26195 Tell multi-parent diff about core.symlinks.
26197 Julian Phillips (5):
26198 Allow fetch--tool to read from stdin
26199 Use stdin reflist passing in parse-remote
26200 Use stdin reflist passing in git-fetch.sh
26201 git-branch: improve abbreviation of sha1s in verbose mode
26202 git-branch: document new --no-abbrev option
26204 Junio C Hamano (80):
26205 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
26206 Make merge-base a built-in.
26207 Allow in_merge_bases() to take more than one reference commits.
26208 Remove git-resolve.
26209 Remove git-diff-stages.
26210 Add link to v1.5.0 documentation.
26211 blame: --show-stats for easier optimization work.
26212 git-fetch: split fetch_main into fetch_dumb and fetch_native
26213 git-fetch--tool: start rewriting parts of git-fetch in C.
26214 git-fetch: move more code into C.
26215 git-fetch: rewrite another shell loop in C
26216 git-fetch: rewrite expand_ref_wildcard in C
26217 Document --ignore-space-at-eol option.
26219 Point top-level RelNotes link at 1.5.1 release notes being prepared.
26220 t0020: add test for auto-crlf
26221 remotes.not-origin.tagopt
26222 Teach 'git apply' to look at $GIT_DIR/config
26223 Teach core.autocrlf to 'git apply'
26224 Update draft release notes for 1.5.1
26225 Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
26226 git-apply: do not lose cwd when run from a subdirectory.
26227 git-apply: require -p<n> when working in a subdirectory.
26228 Link 1.5.0.1 documentation from the main page.
26230 Mechanical conversion to use prefixcmp()
26231 prefixcmp(): fix-up mechanical conversion.
26232 prefixcmp(): fix-up leftover strncmp().
26233 t4119: add test for traditional patch and different p_value
26234 Fix botched "leak fix"
26235 git-apply: notice "diff --git" patch again
26236 git-apply: guess correct -p<n> value for non-git patches.
26237 t4119: test autocomputing -p<n> for traditional diff input.
26238 git-status: do not be totally useless in a read-only repository.
26239 update-index: do not die too early in a read-only repository.
26240 run_diff_{files,index}(): update calling convention.
26241 .mailmap maintenance after pulling from git-svn
26242 bundle: reword missing prerequisite error message
26243 git-fetch--tool takes flags before the subcommand.
26244 diff --cached: give more sensible error message when HEAD is yet to be created.
26245 Documentation: link in 1.5.0.2 material to the top documentation page.
26246 builtin-fetch--tool: adjust to updated sha1_object_info().
26247 Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
26248 fetch--tool: fix uninitialized buffer when reading from stdin
26249 builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
26250 index_fd(): use enum object_type instead of type name string.
26251 index_fd(): pass optional path parameter as hint for blob conversion
26252 index_fd(): convert blob only if it is a regular file.
26253 Add recent changes to draft 1.5.1 release notes.
26254 git-fetch: retire update-local-ref which is not used anymore.
26255 builtin-fetch--tool: fix reflog notes.
26256 diff-ni: allow running from a subdirectory.
26257 diff-ni: fix the diff with standard input
26258 .gitignore: add git-fetch--tool
26259 format-patch --attach: not folding some long headers.
26260 Post 1.5.0.3 cleanup
26261 fsck: fix broken loose object check.
26262 unpack_sha1_file(): detect corrupt loose object files.
26263 fsck: exit with non-zero status upon errors
26264 git-bundle: fix pack generation.
26265 revision walker: Fix --boundary when limited
26266 revision traversal: retire BOUNDARY_SHOW
26267 git-bundle: various fixups
26268 revision traversal: SHOWN means shown
26269 git-bundle: make verify a bit more chatty.
26270 revision --boundary: fix stupid typo
26271 revision --boundary: fix uncounted case.
26272 Fix broken create_branch() in builtin-branch.
26273 prepare_packed_git(): sort packs by age and localness.
26274 Documentation: add git-mergetool to the command list.
26275 shortlog: prompt when reading from terminal by mistake
26276 Remove unused diffcore_std_no_resolve
26278 Teach --quiet to diff backends.
26279 revision.c: explain what tree_difference does
26280 try-to-simplify-commit: use diff-tree --quiet machinery.
26281 applymbox: brown paper bag fix.
26282 Update main git.html page to point at 1.5.0.5 documentation
26287 gitweb: Change to use explicitly function call cgi->escapHTML()
26289 Linus Torvalds (8):
26290 Lazy man's auto-CRLF
26291 Make AutoCRLF ternary variable.
26292 Re-fix get_sha1_oneline()
26293 Make trivial wrapper functions around delta base generation and freeing
26294 Implement a simple delta_base cache
26295 Avoid unnecessary strlen() calls
26296 Trivial cleanup of track_tree_refs()
26297 Set up for better tree diff optimizations
26300 Support for large files on 32bit systems.
26302 Michael Coleman (2):
26303 git-send-email: abort/usage on bad option
26304 fix various doc typos
26306 Nicolas Pitre (12):
26307 sha1_file.c: cleanup hdr usage
26308 sha1_file.c: cleanup "offset" usage
26309 sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
26310 formalize typename(), and add its reverse type_from_string()
26311 convert object type handling from a string to a number
26312 get rid of lookup_object_type()
26313 make sure enum object_type is signed
26314 local-fetch.c: some error printing cleanup
26315 fix t5300-pack-object.sh
26316 add test for OFS_DELTA objects
26317 clean up pack index handling a bit
26318 Reuse cached data out of delta base cache.
26321 git-config: document --rename-section, provide --remove-section
26322 git-archimport: allow remapping branch names
26323 git-commit: add a --interactive option
26324 git-branch, git-checkout: autosetup for remote branch tracking
26325 git-fetch, git-branch: Support local --track via a special remote '.'
26328 git-remote: support remotes with a dot in the name
26331 git-svn: make test for SVK mirror path import
26332 git-svn: don't consider SVN URL usernames significant when comparing
26333 git-svn: document --username
26336 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
26337 t/t5515-fetch-merge-logic.sh: Add two more tests
26340 Documentation/git-svn.txt: Fix formatting errors
26342 Shawn O. Pearce (43):
26343 Cleanup check_valid in commit-tree.
26344 cherry-pick: Bug fix 'cherry picked from' message.
26345 Make 'make' quieter while building git
26346 Make 'make' quiet by default
26347 Display the null SHA-1 as the base for an OBJ_OFS_DELTA.
26348 Fix mmap leak caused by reading bad indexes.
26349 Don't build external_grep if its not used
26350 General const correctness fixes
26351 Use uint32_t for all packed object counts.
26352 Use uint32_t for pack-objects counters.
26353 Use off_t when we really mean a file offset.
26354 Use off_t in pack-objects/fast-import when we mean an offset
26355 Cast 64 bit off_t to 32 bit size_t
26356 Preallocate memory earlier in fast-import
26357 Move post-update hook to after all other activity
26358 Don't run post-update hook unless a ref changed
26359 Refactor run_update_hook to be more useful
26360 Refactor handling of error_string in receive-pack
26361 Teach receive-pack to run pre-receive/post-receive hooks
26362 Use atomic updates to the fast-import mark file
26363 Allow fast-import frontends to reload the marks table
26364 Switch to run_command_v_opt in revert
26365 Remove unused run_command variants
26366 Start defining a more sophisticated run_command
26367 Split run_command into two halves (start/finish)
26368 Teach run_command how to setup a stdin pipe
26369 Refactor run_command error handling in receive-pack
26370 Split back out update_hook handling in receive-pack
26371 Change {pre,post}-receive hooks to use stdin
26372 Remove unnecessary casts from fast-import
26373 Simplify closing two fds at once in run-command.c
26374 Fix t5510-fetch's use of sed
26375 Teach run-command about stdout redirection
26376 Teach run-command to redirect stdout to /dev/null
26377 Replace fork_with_pipe in bundle with run_command
26378 Correct new compiler warnings in builtin-revert
26379 Use RUN_GIT_CMD to run push backends
26380 Use run_command for proxy connections
26381 Use run_command within merge-index
26382 Use run_command within receive-pack to invoke index-pack
26383 Use run_command within send-pack
26385 Limit the size of the new delta_base_cache
26387 Simon 'corecode' Schubert (1):
26388 Allow passing of an alternative CVSROOT via -d.
26391 Teach git-remote to update existing remotes by fetching from them
26392 Add config_boolean() method to the Git perl module
26393 Allow git-remote to update named groups of remotes
26394 Add git-mergetool to run an appropriate merge conflict resolution program
26395 mergetool: print an appropriate warning if merge.tool is unknown
26397 Xavier Maillard (1):
26398 contrib/emacs: Use non-interactive function to byte-compile files
26401 Version v1.5.0.7; changes since v1.5.0.6:
26402 -----------------------------------------
26405 Documentation/git-svnimport.txt: fix typo.
26406 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
26408 H. Peter Anvin (1):
26409 git-upload-pack: make sure we close unused pipe ends
26411 Junio C Hamano (2):
26412 rerere should not repeat the earlier hunks in later ones
26416 Version v1.5.0.6; changes since v1.5.0.5:
26417 -----------------------------------------
26419 J. Bruce Fields (5):
26420 user-manual: run xsltproc without --nonet option
26421 user-manual: Use def_ instead of ref_ for glossary references.
26422 glossary: stop generating automatically
26423 glossary: clean up cross-references
26424 user-manual: introduce "branch" and "branch head" differently
26426 Jakub Narebski (4):
26427 gitweb: Fix "next" link in commit view
26428 gitweb: Don't escape attributes in CGI.pm HTML methods
26429 gitweb: Fix not marking signoff lines in "log" view
26430 gitweb: Add some installation notes in gitweb/INSTALL
26433 commit: fix pretty-printing of messages with "\nencoding "
26436 user-manual.txt: fix a tiny typo.
26438 Johannes Schindelin (1):
26439 t4118: be nice to non-GNU sed
26441 Junio C Hamano (2):
26442 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
26446 gitweb: Change to use explicitly function call cgi->escapHTML()
26448 Michael S. Tsirkin (1):
26449 fix typo in git-am manpage
26452 Documentation/pack-format.txt: Clear up description of types.
26455 Version v1.5.0.5; changes since v1.5.0.4:
26456 -----------------------------------------
26458 Junio C Hamano (1):
26462 git-merge: finish when git-read-tree fails
26465 Version v1.5.0.4; changes since v1.5.0.3:
26466 -----------------------------------------
26468 Alexandre Julliard (2):
26469 git.el: Avoid appending a signoff line that is already present.
26470 git.el: Retrieve commit log information from .dotest directory.
26473 git-send-email: Document configuration options
26475 Brian Gernhardt (1):
26476 Fix diff-options references in git-diff and git-format-patch
26478 Frank Lichtenheld (1):
26479 cvsserver: asciidoc formatting changes
26481 J. Bruce Fields (7):
26482 glossary: fix overoptimistic automatic linking of defined terms
26483 user-manual: fix inconsistent example
26484 user-manual: fix inconsistent use of pull and merge
26485 user-manual: fix missing colon in git-show example
26486 user-manual: fix rendering of history diagrams
26487 user-manual: install user manual stylesheet with other web documents
26488 git-merge: warn when -m provided on a fast forward
26491 Documentation: s/seperator/separator/
26492 fast-import: grow tree storage more aggressively
26494 Johannes Schindelin (2):
26495 Begin SubmittingPatches with a check list
26496 make t8001 work on Mac OS X again
26498 Junio C Hamano (3):
26499 git-commit: cd to top before showing the final stat
26500 git-checkout: fix "eval" used for merge labelling.
26503 Matthias Kestenholz (1):
26504 Adjust reflog filemode in shared repository
26506 Matthias Lederhofer (1):
26507 setup_git_directory_gently: fix off-by-one error
26509 Shawn O. Pearce (13):
26510 git-gui: Relocate the menu/transport menu code.
26511 git-gui: Add Reset to the Branch menu.
26512 git-gui: Don't create empty (same tree as parent) commits.
26513 git-gui: Remove unnecessary /dev/null redirection.
26514 fast-import: Avoid infinite loop after reset
26515 fast-import: Fail if a non-existant commit is used for merge
26516 git-gui: Make 'make' quieter by default
26517 Catch write_ref_sha1 failure in receive-pack
26518 git-gui: Allow committing empty merges
26519 git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.
26520 git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.
26521 git-gui: Allow 'git gui version' outside of a repository
26522 Don't package the git-gui credits file anymore
26525 Add definition of <commit-ish> to the main git man page.
26528 Clarify doc for git-config --unset-all.
26531 Version v1.5.0.3; changes since v1.5.0.2:
26532 -----------------------------------------
26534 Alexandre Julliard (1):
26535 git.el: Set the default commit coding system from the repository config.
26537 Aneesh Kumar K.V (1):
26538 blameview: Fix the browse behavior in blameview
26540 Christian Schlotter (1):
26541 Documentation: Correct minor typo in git-add documentation.
26543 Eygene Ryabinkin (2):
26544 http-push.c::lock_remote(): validate all remote refs.
26545 Another memory overrun in http-push.c
26548 git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
26549 Fix quoting in update hook template
26551 J. Bruce Fields (6):
26552 Documentation: mention module option to git-cvsimport
26553 user-manual: reset to ORIG_HEAD not HEAD to undo merge
26554 user-manual: ensure generated manual references stylesheet
26555 user-manual: insert earlier of mention content-addressable architecture
26556 user-manual: how to replace commits older than most recent
26557 user-manual: more detailed merge discussion
26560 diff --cc: integer overflow given a 2GB-or-larger file
26562 Johannes Schindelin (3):
26563 fetch.o depends on the headers, too.
26564 builtin-archive: use RUN_SETUP
26565 Document the config variable format.suffix
26567 Junio C Hamano (5):
26568 git-apply: do not fix whitespaces on context lines.
26569 Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
26570 Start preparing Release Notes for 1.5.0.3
26571 git-merge: fail correctly when we cannot fast forward.
26574 Linus Torvalds (2):
26575 mailinfo: do not get confused with logical lines that are too long.
26576 git-show: Reject native ref
26578 Matthias Kestenholz (1):
26579 Fix git-gc usage note
26581 Michael Coleman (2):
26582 Fix minor typos/grammar in user-manual.txt
26583 builtin-fmt-merge-msg: fix bugs in --file option
26586 Correct ordering in git-cvsimport's option documentation
26589 git-archimport: support empty summaries, put summary on a single line.
26591 Ramsay Allan Jones (5):
26592 Fix a "label defined but unreferenced" warning.
26593 Fix an "implicit function definition" warning.
26594 Fix some "comparison is always true/false" warnings.
26595 Fix a "pointer type missmatch" warning.
26596 Unset NO_C99_FORMAT on Cygwin.
26599 Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
26600 Documentation/git-quiltimport.txt: Fix labeled list formatting
26601 Documentation/git-send-email.txt: Fix labeled list formatting
26603 Shawn O. Pearce (1):
26604 index-pack: Loop over pread until data loading is complete.
26607 Fix git-show man page formatting in the EXAMPLES section
26609 Uwe Kleine-König (1):
26610 Include config.mak in doc/Makefile
26613 glossary: Add definitions for dangling and unreachable objects
26616 Version v1.5.0.2; changes since v1.5.0.1:
26617 -----------------------------------------
26619 Christian Schlotter (1):
26620 git-clone: Sync documentation to usage note.
26622 Dmitry V. Levin (1):
26623 git-show-ref --verify: Fail if called without a reference
26625 Fredrik Kuivinen (1):
26626 Fix 'git commit -a' in a newly initialized repository
26629 Add a compat/strtoumax.c for Solaris 8.
26630 Obey NO_C99_FORMAT in fast-import.c.
26631 Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
26633 Johannes Schindelin (1):
26634 git-diff: fix combined diff
26636 Junio C Hamano (11):
26637 Reword git-am 3-way fallback failure message.
26638 diff-patch: Avoid emitting double-slashes in textual patch.
26639 Don't modify CREDITS-FILE if it hasn't changed.
26640 rerere: do not skip two conflicted paths next to each other.
26641 rerere: do not deal with symlinks.
26642 Add Release Notes to prepare for 1.5.0.2
26643 merge-index: fix longstanding bug in merging symlinks
26644 merge-recursive: fix longstanding bug in merging symlinks
26645 diff --cc: fix display of symlink conflicts during a merge.
26646 Documentation: describe "-f/-t/-m" options to "git-remote add"
26649 Martin Koegler (1):
26650 git-gui: Create new branches from a tag.
26652 Michael Loeffler (1):
26653 Use gunzip -c over gzcat in import-tars example.
26656 git-remote: support remotes with a dot in the name
26658 Robin Rosenberg (1):
26659 Limit filename for format-patch
26662 Allow arbitrary number of arguments to git-pack-objects
26665 core.legacyheaders: Use the description used in RelNotes-1.5.0
26667 Shawn O. Pearce (16):
26668 git-gui: Refactor 'exec git subcmd' idiom.
26669 git-gui: Basic version check to ensure git 1.5.0 or later is used.
26670 git-gui: Permit merging tags into the current branch.
26671 git-gui: More consistently display the application name.
26672 git-gui: Print version on the console.
26673 git-gui: Prefer version file over git-describe.
26674 git-gui: Expose the browser as a subcommand.
26675 git-gui: Correct crash when saving options in blame mode.
26676 git-gui: Use mixed path for docs on Cygwin.
26677 git-gui: Display all authors of git-gui.
26678 git-gui: Change summary of git-gui.
26679 git-gui: Include browser in our usage message.
26680 git-gui: Remove TODO list.
26681 git-gui: Don't crash in citool mode on initial commit.
26682 Document the new core.bare configuration option.
26683 Include git-gui credits file in dist.
26686 Version v1.5.0.1; changes since v1.5.0:
26687 ---------------------------------------
26689 Alexandre Julliard (2):
26690 git-daemon: Avoid leaking the listening sockets into child processes.
26691 sha1_file.c: Round the mmap offset to half the window size.
26693 Fredrik Kuivinen (2):
26694 Read the config in rev-list
26695 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
26697 Junio C Hamano (15):
26698 Documentation: Drop full-stop from git-fast-import title.
26699 cmd-list: add git-remote
26700 Makefile: update check-docs target
26701 Clarify two backward incompatible repository options.
26702 Still updating 1.5.0 release notes.
26703 Add RelNotes 1.5.0.1
26704 Make sure packedgitwindowsize is multiple of (pagesize * 2)
26705 Make gitk work reasonably well on Cygwin.
26706 gitk: Use show-ref instead of ls-remote
26707 GIT-VERSION-FILE: check ./version first.
26708 pretend-sha1: grave bugfix.
26709 git-merge: minor fix for no_trivial_merge_strategies.
26710 Do not take mode bits from index after type change.
26711 Update draft release notes for 1.5.0.1
26715 gitk - remove trailing whitespace from a few lines.
26716 Make gitk save and restore the user set window position.
26717 Make gitk save and restore window pane position on Linux and Cygwin.
26720 Minor corrections to release notes
26722 Paul Mackerras (1):
26723 Change git repo-config to git config
26725 Shawn O. Pearce (2):
26726 Attempt to improve git-rebase lead-in description.
26727 Convert update-index references in docs to add.
26730 git-blame: prevent argument parsing segfault
26733 Version v1.5.0; changes since v1.5.0-rc4:
26734 -----------------------------------------
26736 Alexandre Julliard (3):
26737 diff.c: Reuse the pprint_rename function for diff --summary output.
26738 diff.c: Properly quote file names in diff --summary output.
26739 diff.c: More logical file name quoting for renames in diffstat.
26742 git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
26743 Fix potential command line overflow in hooks--update
26745 Aneesh Kumar K.V (1):
26746 blameview: Move the commit info to a pane below the blame window.
26749 Handle uncommitted changes and cache descriptions
26750 git-blame.el: improve color handling
26751 git-blame.el: blame unsaved changes
26752 git-blame.el: Doc fixes and cleanup
26753 git-blame.el: Autoupdate while editing
26756 Make it easier to override path to asciidoc command
26759 git-svn: correctly handle boolean options via git-config
26761 Jakub Narebski (2):
26762 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate
26763 git-blame: Change installation instructions
26766 Read cvsimport options from repo-config
26768 Johannes Schindelin (5):
26769 for_each_reflog_ent: be forgiving about missing message
26770 log --reflog: honour --relative-date
26771 format-patch -n: make sorting easier by padding number
26772 log --reflog: use dwim_log
26773 git-gc: run pack-refs by default unless the repo is bare
26775 Junio C Hamano (17):
26776 create_symref(): create leading directories as needed.
26777 reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
26778 Documentation/git-pull: describe default behaviour and config interactions
26779 git-fetch: document automatic tag following.
26780 wt_status_prepare(): clean up structure initialization.
26781 diff_flush_name(): take struct diff_options parameter.
26782 t4016: test quoting funny pathnames in diff output
26783 Documentation: git-rebase -C<n>
26784 Teach git-am to pass -p option down to git-apply
26785 Add discussion section to git-tag documentation.
26786 Add RPM target for git-gui
26787 Do not forget to pack objects reachable from HEAD reflog.
26788 for-each-reflog: not having $GIT_DIR/logs directory is not an error.
26789 "git-fetch --tags $URL" should not overwrite existing tags
26790 Documentation: Moving out of detached HEAD does not warn anymore.
26791 Add release notes to the distribution.
26794 Linus Torvalds (2):
26796 Mark places that need blob munging later for CRLF conversion.
26799 Make gitk save and restore the user set window position.
26800 Make gitk save and restore window pane position on Linux and Cygwin.
26802 Matthias Lederhofer (1):
26803 git merge documentation: -m is optional
26805 Michael Loeffler (1):
26806 import-tars: brown paper bag fix for file mode.
26808 Michael S. Tsirkin (3):
26809 Update git-log and git-show documentation
26810 add -C[NUM] to git-am
26811 Document that git-am can read standard input.
26814 Work around Subversion race in git-svn tests.
26817 Fixed some typos in git-repack docs
26820 remove mailmap.linux
26821 Update RPM core package description
26824 Clarify that git-update-server-info should be run for every git-push
26827 Avoid ugly linewrap in git help
26829 Shawn O. Pearce (313):
26830 git-gui: Initial revision.
26831 git-gui: Additional early feature development.
26832 git-gui: Fixed UI layout problems on Windows.
26833 git-gui: Corrected keyboard bindings on Windows, improved state management.
26834 git-gui: Verify we should actually perform a commit when asked to do so.
26835 git-gui: Finished commit implementation.
26836 git-gui: Implemented amended commits.
26837 git-gui: Misc. nit type of bug fixes.
26838 git-gui: Started construction of fetch and push operations.
26839 git-gui: Worked around environment variable problems on Windows.
26840 git-gui: Reorganized startup procedure to ensure gitdir is right.
26841 git-gui: Fix menu item accelerator display on Mac OS X.
26842 git-gui: Correctly handle CR vs. LF within the console of fetch.
26843 git-gui: Check for fetch or push command failure and denote it.
26844 git-gui: Don't complain if no .git/remotes exist.
26845 git-gui: Added current TODO list.
26846 git-gui: Last minute idea about fetch shortcuts.
26847 git-gui: Automatically reopen any console closed by the user.
26848 git-gui: Cache all repo-config data in an array.
26849 git-gui: Added support for pulling from default branch of a remote.
26850 git-gui: Updated TODO list now that pull is starting to work.
26851 git-gui: Corrected diff-index/diff-files protocol parsing errors.
26852 git-gui: Performance improvements for large file sets.
26853 git-gui: More performance improvements to rescan logic.
26854 git-gui: Flip commit message buffer and diff area.
26855 git-gui: Added repack database menu option, to invoke git repack.
26856 git-gui: Allow the user to disable update-index --refresh during rescan.
26857 git-gui: Grab the index lock while running pull.
26858 git-gui: Pluralize timestamps within the options menu.
26859 git-gui: Disable pull menu items when the index is locked.
26860 git-gui: Don't let the user pull into an uncommitted working directory.
26861 git-gui: Update TODO list.
26862 git-gui: Bug fix for bad variable reference in display_file.
26863 git-gui: Changed term 'check-in' to 'include'.
26864 git-gui: Show only the abbreviated SHA1 after committing.
26865 git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
26866 git-gui: Save window geometry to .git/config during exit.
26867 git-gui: Change accelerator for "Include All" to M1-I.
26868 git-gui: Created edit menu and basic editing bindings.
26869 git-gui: Clear undo/redo stack when loading a message file from disk.
26870 git-gui: Updated TODO list now that geometry is stored.
26871 git-gui: Always indicate the file in the diff viewer.
26872 git-gui: Correctly handle files containing LF in their name.
26873 git-gui: Efficiently update the UI after committing.
26874 git-gui: Use catch rather than array names to check file.
26875 git-gui: Rename difffont/mainfont variables.
26876 git-gui: Use native tk_messageBox for errors.
26877 git-gui: Cleaned up error message formatting.
26878 git-gui: Simplified format of geometry configuration.
26879 git-gui: Misc. formatting cleanups.
26880 git-gui: Misc. bug fixes for mouse click crashes.
26881 git-gui: Added context menus for consoles and commit message buffer.
26882 git-gui: Fix mouse cursor behavior when in widgets.
26883 git-gui: Teach sign off to be more intelligent.
26884 git-gui: Corrected font used for options menu items.
26885 git-gui: Honor system font and let user configure fonts.
26886 git-gui: Allow the user to change the diff viewer font size.
26887 git-gui: Refresh a file if it has an empty diff.
26888 git-gui: Make use of the Tk font system rather than faking it.
26889 git-gui: Improve right click context menu binding on all platforms.
26890 git-gui: Rename quitting global to is_quitting.
26891 git-gui: Use arrow cursor rather than left_ptr.
26892 git-gui: Refactor options menu into an options dialog.
26893 git-gui: Allow the user to manipulate the fonts from the options panel.
26894 git-gui: Supply progress feedback when running update-index.
26895 git-gui: Minor options dialog UI cleanups.
26896 git-gui: Added Options... menu item to end of diff context menu.
26897 git-gui: Use 'after 1' to post UI rather than tkwait.
26898 git-gui: Correct bugs in font config handling.
26899 git-gui: Hide non-commit related commands when invoked as git-citool.
26900 git-gui: Don't load the global options unless necessary.
26901 git-gui: Allow the user to disable diff stat summary during pull.
26902 git-gui: Run the pre-commit hook in the background.
26903 git-gui: Remove the commit_active global variable.
26904 git-gui: Added post-commit invocation after the commit is done.
26905 git-gui: Always use eq/ne for string comparsions.
26906 git-gui: Reshow diff if we sent the file to update-index.
26907 git-gui: Cleanup diff construction code to prepare for more options.
26908 git-gui: Allow the user to control the number of context lines in a diff.
26909 git-gui: Sort the list of paths being updated in the index.
26910 git-gui: Use a smaller pipe buffer for update-index.
26911 git-gui: Allow the user to copy name of the file in the diff viewer.
26912 git-gui: Correct language for M_/A_ status codes.
26913 git-gui: Display status on left in diff header.
26914 git-gui: Minor UI layout improvements for console windows.
26915 git-gui: Reverted file name text field to a label.
26916 git-gui: By default don't allow partially included files.
26917 git-gui: Refactor mouse clicking on file names/icons.
26918 git-gui: Narrow the no differences information message.
26919 git-gui: Implemented multiple selection in file lists.
26920 git-gui: Refactor update_status -> rescan.
26921 git-gui: Provide an after-rescan script to rescan.
26922 git-gui: Allow update_index to also run a script when it completes.
26923 git-gui: Automatically update-index all included files before commit.
26924 git-gui: Disable diff actions when no diff is active.
26925 git-gui: Created makefile to install the program.
26926 git-gui: Correctly handle GIT_DIR environment variable.
26927 git-gui: Create Windows shortcut icons for git-gui.
26928 git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
26929 git-gui: Handle ' within paths when creating Windows shortcuts.
26930 git-gui: Only populate a fetch or push if we have an action.
26931 git-gui: Create a .app file on MacOS X if requested.
26932 git-gui: Display error dialog on Mac OS X when no .git found.
26933 git-gui: Make initial commits work properly.
26934 git-gui: Only reshow diff when really necessary.
26935 git-gui: Refactor file state representations.
26936 git-gui: Add menu option to include only selected files.
26937 git-gui: Misc. comment formatting cleanups.
26938 git-gui: Start UI with the index locked.
26939 git-gui: Remove completed items from TODO list.
26940 git-gui: Toggle between new commit and amend commit modes.
26941 git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
26942 git-gui: Rephrase rescan before commit informational message.
26943 git-gui: Allow adding untracked files in selection.
26944 git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
26945 git-gui: Teach the gui how to uninclude a file.
26946 git-gui: Make consecutive icon clicks toggle included status of a file.
26947 git-gui: Correct toggling of deleted file status.
26948 git-gui: Fix list loading corruption introduced by 1461c5f3.
26949 git-gui: Describe deleted symlinks in a more friendly way.
26950 git-gui: Correct toggling of added/untracked status for new files.
26951 git-gui: Updated TODO list now that a task is complete.
26952 git-gui: Refactored diff line display formatting logic.
26953 git-gui: Restore the all important shebang line.
26954 git-gui: Update in memory states after commit.
26955 git-gui: Correct some state matchings for include/remove.
26956 git-gui: Improve handling of merge commits.
26957 git-gui: Allow users to run fsck-objects from the gui.
26958 git-gui: Don't save amended commit message buffer.
26959 git-gui: Reworded verify console title.
26960 git-gui: Seperate out the database operations in project menu.
26961 git-gui: Rename Project menu to Repository.
26962 git-gui: Added about dialog box.
26963 git-gui: Be more Macintosh like.
26964 git-gui: Make the copyright notice serve double duty.
26965 git-gui: Include the Tcl/Tk version in the about dialog.
26966 git-gui: Abstract out windows platform test to is_Windows proc.
26967 git-gui: Correct is_MacOSX platform test.
26968 git-gui: Warn Cygwin users about possible environment issues.
26969 git-gui: Added configuration editor TODO list.
26970 git-gui: Refactor M1 binding selection.
26971 git-gui: Added menu command to visualize all branches.
26972 git-gui: Don't start 'gitk --all' on Mac OS X.
26973 git-gui: Improve pull error dialogs.
26974 git-gui: Added revert changes command.
26975 git-gui: Display the current branch.
26976 git-gui: Support file state MD (modified/deleted).
26977 git-gui: Created Branch menu.
26978 git-gui: Parse off refs/remotes when showing current branch.
26979 git-gui: Abort on not implemented branch switching.
26980 git-gui: Automatically skip tracking branches in branch menu.
26981 git-gui: Rename all_branches -> all_heads.
26982 git-gui: Misc. comment and formatting cleanups.
26983 git-gui: Started implementation of switch_branch.
26984 git-gui: Set a proper title on our revert confirm dialog box.
26985 git-gui: Updated todo list.
26986 git-gui: Enable resolution of merge conflicts.
26987 git-gui: Auto-update any A? or M? files during rescan.
26988 git-gui: Reworded 'Include' to 'Add' to match core Git.
26989 git-gui: Created very crude Tools menu, to support miga.
26990 git-gui: Show all fetched branches for remote pulls.
26991 git-gui: Run git-gc rather than git-repack.
26992 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
26993 git-gui: Correct wording of the revert confirmation dialog.
26994 git-gui: Work around odd cygpath bug on Windows.
26995 git-gui: Change more 'include' language to 'add'.
26996 git-gui: Hide the ugly bash command line from the windows desktop icon.
26997 git-gui: Modified makefile to embed version into git-gui script.
26998 git-gui: Display the git-gui version in the Help->About dialog.
26999 git-gui: Display the full GPL copyright notice in about dialog.
27000 git-gui: Ensure version number is always current.
27001 git-gui: Allow the user to copy the version data to the clipboard.
27002 git-gui: Don't offer my miga hack if its configuration file isn't present.
27003 git-gui: Suggest when running 'git gc' may be worthwhile.
27004 git-gui: Refactor reponame computation.
27005 git-gui: Cleanup usage of gitdir global variable.
27006 git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
27007 git-gui: Make the gitk starting message match our usual format.
27008 git-gui: Display the directory we are entering during startup.
27009 git-gui: Start file status display refactoring.
27010 git-gui: Convert UI to use 'staged for commit' interface.
27011 git-gui: Correct DD file state to be only D_.
27012 git-gui: Remove invalid DM state.
27013 git-gui: Cleanup state descriptions.
27014 git-gui: Refactor add/remove proc names to align with reality.
27015 git-gui: Add or unstage based on the specific icon used.
27016 git-gui: Refactor the revert (aka checkout-index) implementation.
27017 git-gui: Refactor the add to commit state filters.
27018 git-gui: Simplify printing of index info to update-index.
27019 git-gui: Only permit selection in one list at a time.
27020 git-gui: Pad the cancel/save buttons in the options window.
27021 git-gui: Implemented create branch GUI.
27022 git-gui: Bind M1-N to create branch.
27023 git-gui: Implemented local branch deletion.
27024 git-gui: Allow users to delete branches merged upstream.
27025 git-gui: Allow creating branches from tracking heads.
27026 git-gui: Use borders on text fields in branch dialog.
27027 git-gui: Remove 'Allow Partially Added Files' option.
27028 git-gui: Move commit_prehook into commit_tree.
27029 git-gui: Improve the branch delete confirmation dialogs.
27030 git-gui: Don't delete the test target branch.
27031 git-gui: Attempt to checkout the new branch after creation.
27032 git-gui: Refactor current_diff -> current_diff_path.
27033 git-gui: Remove combined diff showing behavior.
27034 git-gui: Improve the display of merge conflicts.
27035 git-gui: Improve diff --cc viewing for unmerged files.
27036 git-gui: Fix bug in unmerged file display.
27037 git-gui: Clear diff from viewer if the side changed.
27038 git-gui: Correct disappearing unstaged files.
27039 git-gui: Add Refresh to diff viewer context menu.
27040 git-gui: Correct unmerged file detection at commit time.
27041 git-gui: Pad new branch name input box.
27042 git-gui: Use a grid layout for branch dialog.
27043 git-gui: Improve the merge check interface for branch deletion.
27044 git-gui: Change rude error popup to info popup.
27045 git-gui: Correctly ignore '* Unmerged path' during diff.
27046 git-gui: Make diff viewer colors match gitk's defaults.
27047 git-gui: Never line wrap in file lists.
27048 git-gui: Don't offer tracking branches if none exist.
27049 git-gui: Give a better error message on an empty branch name.
27050 git-gui: Allow user to specify a branch name pattern.
27051 git-gui: Improve keyboard traversal in dialogs.
27052 git-gui: Fully select a field when entering into it.
27053 git-gui: Automatically toggle the relevant radio buttons.
27054 git-gui: Correctly categorize tracking branches and heads.
27055 git-gui: Update todo list with finished and new items.
27056 git-gui: Slightly tweak new window geometry.
27057 git-gui: Create missing branch head on initial commit.
27058 git-gui: Don't format the mode line of a diff.
27059 git-gui: Force an update-index --refresh on unchanged files.
27060 git-gui: Don't attempt to tag new file/deleted file headers in diffs.
27061 git-gui: Fix 'Select All' action on Windows.
27062 git-gui: Ignore 'No newline at end of file' marker line.
27063 git-gui: Always start a rescan on an empty diff.
27064 git-gui: Don't show content of untracked binary files.
27065 git-gui: Limit display of large untracked files.
27066 git-gui: When possible show the type of an untracked file.
27067 git-gui: Don't try to tag the 'Binary files * and * differ' line.
27068 git-gui: Remove spurious newline in untracked file display.
27069 git-gui: Honor system encoding for filenames.
27070 git-gui: Handle commit encoding better.
27071 git-gui: Display database stats (count-objects -v) on demand.
27072 git-gui: Implement basic branch switching through read-tree.
27073 git-gui: Use system default labelframe bordering.
27074 git-gui: Display the size of the pack directory.
27075 git-gui: Only allow Refresh in diff context menu when we have a diff.
27076 git-gui: Allow staging/unstaging individual diff hunks.
27077 git-gui: Elide CRs appearing in diff output from display.
27078 git-gui: Cleanup end-of-line whitespace in commit messages.
27079 git-gui: Unset unnecessary UI setup variable.
27080 git-gui: Force focus to the diff viewer on mouse click.
27081 git-gui: Support 'Visualize All Branches' on Mac OS X.
27082 git-gui: Pad the database statistics dialog window.
27083 git-gui: Prefer Tk's entry widget over a 1 line text field.
27084 git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
27085 git-gui: Don't switch branches if changing to the current branch.
27086 git-gui: Maintain the same file list for diff during refresh.
27087 git-gui: Always use lsearch -exact, to prevent globbing.
27088 git-gui: Added arbitrary branch pushing support.
27089 git-gui: Remove no longer used pull from remote code.
27090 git-gui: Always use -v option to push.
27091 git-gui: Refactor console success/failure handling.
27092 git-gui: Use builtin version of 'git gc'.
27093 git-gui: Implement local merge operations.
27094 git-gui: Let users abort with `reset --hard` type logic.
27095 git-gui: Update status bar during a merge.
27096 git-gui: Don't allow users to commit a bad octopus merge.
27097 git-gui: Don't allow merges in the middle of other things.
27098 git-gui: Always offer scrollbars for branch lists.
27099 git-gui: Support merge.summary, merge.verbosity.
27100 git-gui: Reword meaning of merge.summary.
27101 git-gui: Offer quick access to the HTML formatted documentation.
27102 git-gui: Test for Cygwin differently than from Windows.
27103 git-gui: Implemented file browser and incremental blame.
27104 git-gui: Improve the icons used in the browser display.
27105 git-gui: Display the current branch name in browsers.
27106 git-gui: Allow users to edit user.name, user.email from options.
27107 git-gui: Use -M and -C when running blame.
27108 git-gui: Correctly handle spaces in filepaths.
27109 git-gui: Display original filename and line number in blame.
27110 git-gui: Install column headers in blame viewer.
27111 git-gui: Use a grid layout for the blame viewer.
27112 git-gui: Assign background colors to each blame hunk.
27113 Correct ^0 asciidoc syntax in fast-import docs.
27114 Correct some language in fast-import documentation.
27115 Correct spelling of fast-import in docs.
27116 tar archive frontend for fast-import.
27117 git-gui: Update known branches during rescan.
27118 git-gui: Support keyboard traversal in browser.
27119 git-gui: Replace \ with \\ when showing paths.
27120 git-gui: Refactor single_commit to a proc.
27121 git-gui: Separate transport/branch menus from multicommit.
27122 git-gui: Optionally save commit buffer on exit.
27123 git-gui: View blame from the command line.
27124 git-gui: Select subcommands like git does.
27125 git-gui: Relabel the Add All action.
27126 git-gui: Use git-config now over git-repo-config.
27127 git-gui: Redesign the display of annotated files.
27128 git-gui: Jump to the first annotation block as soon as its available.
27129 git-gui: Improve annotated file display.
27130 git-gui: Focus into blame panels on Mac OS.
27131 git-gui: Stop deleting gitk preferences.
27132 fast-import: Hide the pack boundary commits by default.
27133 fast-import: Add tip about importing renames.
27134 bash: Hide git-fast-import.
27135 fast-import: Support reusing 'from' and brown paper bag fix reset.
27136 git-gui: Allow gitexecdir, INSTALL to be set by the caller.
27137 git-gui: Rename GIT_VERSION to GITGUI_VERSION.
27138 git-gui: Generate a version file on demand.
27139 git-gui: Handle gitgui tags in version gen.
27140 git-gui: Guess our version accurately as a subproject.
27141 git-gui: Change base version to 0.6.
27142 Link git-gui into the master Makefile.
27145 Print a sane error message if an alias expands to an invalid git command
27146 Allow aliases to expand to shell commands
27149 Version v1.5.0-rc4; changes since v1.5.0-rc3:
27150 ---------------------------------------------
27153 Avoid ActiveState Perl IO in t800[12]
27156 doc: hooks.txt said post-commit default sends an email, it doesn't
27157 git-for-each-ref doesn't return "the bit after $GIT_DIR/refs"
27159 Aneesh Kumar K.V (1):
27160 blameview: Support browsable functionality to blameview.
27163 git-blame: an Emacs minor mode to view file with git-blame output.
27166 git-svn: do not let Git.pm warn if we prematurely close pipes
27167 Disallow invalid --pretty= abbreviations
27170 git-archimport: initial import needs empty directory
27172 Horst H. von Brand (1):
27173 Call make always with CFLAGS in git.spec
27175 Johannes Schindelin (4):
27176 Teach the '@{...}' notation to git-log -g
27177 Update the documentation for the new '@{...}' syntax
27178 Commands requiring a work tree must not run in GIT_DIR
27179 fast-import: Fix compile warnings
27181 Junio C Hamano (36):
27182 create_symref(): do not assume pathname from git_path() persists long enough
27183 detached HEAD -- finishing touches
27184 Use "git checkout -q" in git-bisect
27185 Tutorial: fix asciidoc formatting of "git add" section.
27186 Tutorial-2: Adjust git-status output to recent reality.
27187 core-tutorial: http reference link fix
27188 fix reflog entries for "git-branch"
27189 honor GIT_REFLOG_ACTION in git-commit
27190 Why is it bad to rewind a branch that has already been pushed out?
27191 combine-diff: special case --unified=0
27192 show-branch -g: default to the current branch.
27193 git-clone --reference: saner handling of borrowed symrefs.
27194 Revert "Allow branch.*.merge to talk about remote tracking branches."
27195 Rename get_ident() to fmt_ident() and make it available to outside
27196 t9200: Work around HFS+ issues.
27197 bisect: it needs to be done in a working tree.
27198 git-blame: no rev means start from the working tree file.
27199 Add pretend_sha1_file() interface.
27200 Use pretend_sha1_file() in git-blame and git-merge-recursive.
27201 blame: document --contents option
27202 Teach git-remote add to fetch and track
27203 Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
27204 gitk: Use show-ref instead of ls-remote
27205 git-push: allow globbing wildcard refspec.
27206 gitweb: fix mismatched parenthesis
27207 annotate: fix for cvsserver.
27209 Remove contrib/colordiff
27210 Add deprecation notices.
27211 Remove git-merge-recur
27212 git-clone --reference: work well with pack-ref'ed reference repository
27213 for-each-reflog: fix case for empty log directory
27214 t4200: skip gc-rerere test on systems with non GNU date.
27215 git-add -i: update removed path correctly.
27216 Documentation: Add gfi to the main command list.
27219 Linus Torvalds (2):
27220 pager: Work around window resizing bug in 'less'
27221 Fix "git log -z" behaviour
27224 gitk - remove trailing whitespace from a few lines.
27225 Make gitk work reasonably well on Cygwin.
27227 Michael Coleman (1):
27228 Fix some documentation typos and grammar
27230 Michele Ballabio (1):
27231 Documentation: add KMail in SubmittingPatches
27233 Nicolas Pitre (14):
27234 make reflog filename independent from struct ref_lock
27235 lock_ref_sha1_basic(): remember the original name of a ref when resolving it
27236 enable separate reflog for HEAD
27237 add reflog entries for HEAD when detached
27238 move create_symref() past log_ref_write()
27239 add logref support to git-symbolic-ref
27240 add reflog when moving HEAD to a new branch
27241 reword the detached head message a little again
27242 add a quiet option to git-checkout
27243 prevent HEAD reflog to be interpreted as current branch reflog
27244 provide a nice @{...} syntax to always mean the current branch reflog
27245 scan reflogs independently from refs
27246 Enable HEAD@{...} and make it independent from the current branch
27247 Let git-checkout always drop any detached head
27250 git-config --rename-section could rename wrong section
27251 Assorted typo fixes
27253 Robin Rosenberg (1):
27254 Why is it bad to rewind a branch that has already been pushed out?
27256 Shawn O. Pearce (113):
27257 Created fast-import, a tool to quickly generating a pack from blobs.
27258 Added automatic index generation to fast-import.
27259 Cleaned up memory allocation for object_entry structs.
27260 Refactored fast-import's internals for future additions.
27261 Added basic command handler to fast-import.
27262 Implemented branch handling and basic tree support in fast-import.
27263 Added tree and commit writing to fast-import.
27264 Implement blob ID validation in fast-import.
27265 Converted fast-import to a text based protocol.
27266 Changed fast-import's pack header creation to use pack.h
27267 Allow symlink blobs in trees during fast-import.
27268 Fixed segfault in fast-import after growing a tree.
27269 Converted fast-import to accept standard command line parameters.
27270 Added mark store/find to fast-import.
27271 Added branch load counter to fast-import.
27272 Implemented 'tag' command in fast-import.
27273 Implemented tree reloading in fast-import.
27274 Round out memory pool allocations in fast-import to pointer sizes.
27275 Remove branch creation command from fast-import.
27276 Moved from command to after data to help cvs2svn.
27277 Account for tree entry memory costs in fast-import.
27278 Added option to export the marks table when fast-import terminates.
27279 Added --branch-log to option to fast-import.
27280 Fixed GPF in fast-import caused by unterminated linked list.
27281 Fixed compile error in fast-import.
27282 Map only part of the generated pack file at any point in time.
27283 Added 'reset' command to clear a branch's tree.
27284 Don't crash fast-import if no branch log was requested.
27285 Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
27286 Implemented tree delta compression in fast-import.
27287 Recycle data buffers for tree generation in fast-import.
27288 Reuse the same buffer for all commits/tags in fast-import.
27289 Replace ywrite in fast-import with the standard write_or_die.
27290 Correct tree corruption problems in fast-import.
27291 Additional fast-import tree delta corruption cleanups.
27292 Fix repository corruption when using marks for modified blobs.
27293 Support creation of merge commits in fast-import.
27294 Allow creating branches without committing in fast-import.
27295 Improve reuse of sha1_file library within fast-import.
27296 Misc. type cleanups within fast-import.
27297 Restructure fast-import to support creating multiple packfiles.
27298 Remove unnecessary duplicate_count in fast-import.
27299 Implemented manual packfile switching in fast-import.
27300 Don't create a final empty packfile in fast-import.
27301 Optimize index creation on large object sets in fast-import.
27302 Implemented automatic checkpoints within fast-import.
27303 Print the packfile names to stdout from fast-import.
27304 Corrected buffer overflow during automatic checkpoint in fast-import.
27305 Use uintmax_t for marks in fast-import.
27306 Replace redundant yread() with read_in_full() in fast-import.
27307 Reuse sha1 in packed_git in fast-import.
27308 Use .keep files in fast-import during processing.
27309 Ensure we close the packfile after creating it in fast-import.
27310 Remove unnecessary pack_fd global in fast-import.
27311 Correct max_packsize default in fast-import.
27312 Correct object_count type and stat output in fast-import.
27313 Print out the edge commits for each packfile in fast-import.
27314 Corrected BNF input documentation for fast-import.
27315 Correct a few types to be unsigned in fast-import.
27316 Declare no-arg functions as (void) in fast-import.
27317 Correct packfile edge output in fast-import.
27318 Always use struct pack_header for pack header in fast-import.
27319 Use fixed-size integers when writing out the index in fast-import.
27320 Remove unnecessary options from fast-import.
27321 Support delimited data regions in fast-import.
27322 Create test case for fast-import.
27323 Reduce value duplication in t9300-fast-import.
27324 Accept 'inline' file data in fast-import commit structure.
27325 Pull out remote listing functions in git-remote.
27326 Teach 'git remote' how to cleanup stale tracking branches.
27327 Cleanup prepare_packed_git_one to reuse install_packed_git.
27328 Correct comment in prepare_packed_git_one.
27329 Refactor open_packed_git to return an error code.
27330 Don't find objects in packs which aren't available anymore.
27331 Don't leak file descriptors from unavailable pack files.
27332 Cleanup subcommand documentation for git-remote.
27333 Keep untracked files not involved in a merge.
27334 Default GIT_MERGE_VERBOSITY to 5 during tests.
27335 bash: Remove short option completions for branch/checkout/diff.
27336 bash: Classify cat-file and reflog as plumbing.
27337 bash: Complete long options to git-add.
27338 bash: Add space after unique command name is completed.
27339 bash: Classify more commends out of completion.
27340 bash: Support unique completion on git-config.
27341 bash: Support unique completion when possible.
27342 bash: Support internal revlist options better.
27343 Include checkpoint command in the BNF.
27344 Reduce memory usage of fast-import.
27345 Show an example of deleting commits with git-rebase.
27346 bash: Support completion on git-cherry.
27347 bash: Hide diff-stages from completion.
27348 bash: Offer --prune completion for git-gc.
27349 bash: Hide git-resolve, its deprecated.
27350 bash: Support --add completion to git-config.
27351 bash: Support git-bisect and its subcommands.
27352 Don't support shell-quoted refnames in fast-import.
27353 Initial draft of fast-import documentation.
27354 bash: Support git-rebase -m continuation completion.
27355 bash: Complete git-remote subcommands.
27356 Remove --branch-log from fast-import.
27357 Correct compiler warnings in fast-import.
27358 Correct minor style issue in fast-import.
27359 Correct fast-import timezone documentation.
27360 Remove unnecessary null pointer checks in fast-import.
27361 Minor fast-import documentation corrections.
27362 Support RFC 2822 date parsing in fast-import.
27363 Don't do non-fastforward updates in fast-import.
27364 Minor timestamp related documentation corrections for fast-import.
27365 Teach fast-import how to clear the internal branch content.
27366 Teach fast-import how to sit quietly in the corner.
27367 Dump all refs and marks during a checkpoint in fast-import.
27368 Don't crash fast-import if the marks cannot be exported.
27369 Add a Tips and Tricks section to fast-import's manual.
27371 Simon 'corecode' Schubert (1):
27372 Allow forcing of a parent commit, even if the parent is not a direct one.
27375 Add hg-to-git conversion utility.
27377 Uwe Kleine-König (1):
27378 add replay and log to the usage string of git-bisect
27381 gitweb: Convert project name to UTF-8
27384 Version v1.5.0-rc3; changes since v1.5.0-rc2:
27385 ---------------------------------------------
27388 Insert ACTIVESTATE_STRING in Git.pm
27389 Force Activestate Perl to tie git command pipe handle to a handle class
27390 Cleanup uninitialized value in chomp
27391 Allow default core.logallrefupdates to be overridden with template's config
27392 Fix git-update-index to work with relative pathnames.
27394 Alexandre Julliard (1):
27395 vc-git.el: Take into account the destination name in vc-checkout.
27398 New files in git weren't being downloaded during CVS update
27399 If abbrev is set to zero in git-describe, don't add the unique suffix
27400 Allow the tag signing key to be specified in the config file
27401 UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone
27402 Heavily expanded update hook to send more useful emails than the old hook
27404 Aneesh Kumar K.V (2):
27405 blameview: Use git-cat-file to read the file content.
27406 Update git-cat-file documentation
27409 Document --check option to git diff.
27412 Improved error message from git-rebase
27415 git-svn: remove leading slash when printing removed directories
27417 J. Bruce Fields (31):
27418 Documentation: add git user's manual
27419 Documentation: expand preface and todo's
27420 Documentation: git-rebase discussion, miscellaneous user-manual updates
27421 Documentation: more user-manual todo's
27422 Documentation: reorder development section, todo's
27423 Documentation: begin discussion of git-remote in user manual
27424 Documentation: rev-list -> rev-parse, other typos, start examples
27425 user manual: answer some comments from Junio
27426 user-manual: replace init-db by init
27427 user-manual: reindent
27428 user-manual: rewrap, fix heading levels
27429 user-manual: add "quick start" as chapter 1
27430 user-manual: minor quickstart reorganization
27431 user-manual: clarify difference between tag and branch
27432 user-manual: update references discussion
27433 user-manual: update git-gc discussion
27434 user-manual: stub discussion of fsck and reflog
27435 user-manual: reorganize fetch discussion, add internals, etc.
27436 user-manual: git-fsck, dangling objects
27437 user-manual: fsck-objects -> fsck
27438 user-manual: repo-config -> config
27439 user-manual: add references to git-config man page
27440 user-manual: typo fix
27441 user-manual: fix a header level
27442 user-manual: reflogs, other recovery
27443 user-manual: rewrap a few long lines
27444 user-manual: minor "TODO" updates
27445 user-manual: document git-show-branch example
27446 user-manual: SHA1 -> object name
27447 user-manual: point to README for gitweb information
27448 user-manual: todo's
27450 Jakub Narebski (3):
27451 Documentation/config.txt: Document config file syntax better
27452 t/t1300-repo-config.sh: value continued on next line
27453 Documentation/config.txt: Correct info about subsection name
27456 Use inttypes.h rather than stdint.h.
27459 format-patch: fix bug with --stdout in a subdirectory
27460 contrib/vim: update syntax for changed commit template
27461 diffcore-pickaxe: fix infinite loop on zero-length needle
27462 Add a sample program 'blameview' to show how to use git-blame --incremental
27464 Johannes Schindelin (2):
27465 annotate: use pager
27466 reflog inspection: introduce shortcut "-g"
27469 Add a missing fork() error check.
27471 Junio C Hamano (43):
27472 User manual: fix typos in examples
27473 Documentation/tutorial-2: Fix interesting typo in an example.
27474 Revert "prune: --grace=time"
27475 Make sure git_connect() always give two file descriptors.
27476 is_repository_shallow(): prototype fix.
27477 shallow repository: disable unsupported operations for now.
27478 git-gc: do not run git-prune by default.
27479 cvsimport: activate -a option, really.
27480 .mailmap: fix screw-ups in Uwe's name
27481 honor --author even with --amend, -C, and -c.
27482 reflog gc: a tag that does not point at a commit is not a crime.
27483 git-checkout -m: fix merge case
27484 git-daemon documentation on enabling services.
27485 ls-remote and clone: accept --upload-pack=<path> as well.
27486 Refactor the pack header reading function out of receive-pack.c
27487 Allow fetch-pack to decide keeping the fetched pack without exploding
27488 fetch-pack: remove --keep-auto and make it the default.
27489 Consolidate {receive,fetch}.unpackLimit
27490 Allow non-developer to clone, checkout and fetch more easily.
27491 parse-remote: do not barf on a remote shorthand without any refs to fetch.
27492 show-branch -g: default to HEAD
27493 Documentation: pack-refs --all vs default behaviour
27494 Make sure we do not write bogus reflog entries.
27495 git-merge: leave sensible reflog message when used as the first level UI.
27496 create_symref: check error return from open().
27497 write_in_full: size_t is unsigned.
27498 Don't force everybody to call setup_ident().
27499 git-blame --porcelain: quote filename in c-style when needed.
27500 Update describe documentation.
27501 Document 'git-blame --incremental'
27502 git-fsck-objects is now synonym to git-fsck
27503 Two small typofixes.
27504 lock_any_ref_for_update(): do not accept malformatted refs.
27505 git-commit -s: no extra space when sign-offs appear at the end already.
27506 git-blame: somewhat better commenting.
27507 git-send-email: remove debugging output.
27509 Documentation: "git-checkout <tree> <path>" takes any tree-ish
27510 t9200: Re-code non-ascii path test in UTF-8
27511 t9200: do not test -x bit if the filesystem does not support it.
27512 git main documentation: point at the user's manual.
27513 Do not use hardcoded path to xhmtl.xsl to generate user's manual
27516 Linus Torvalds (5):
27517 fsck-objects: refactor checking for connectivity
27518 Fix seriously broken "git pack-refs"
27519 Add dangling objects tips.
27520 git-blame --incremental
27521 git-push through git protocol
27524 wt-status: Actually accept `color.status.BLAH' configuration variables.
27525 Documentation/config.txt: Fix documentation of colour config tweaks.
27526 Make fsck and fsck-objects be builtins.
27529 fix suggested branch creation command when detaching head
27530 git-log -g --pretty=oneline should display the reflog message
27531 tone down the detached head warning
27534 sha1_file.c: Avoid multiple calls to find_pack_entry().
27535 Documentation: --amend cannot be combined with -c/-C/-F.
27538 git-blame --incremental: don't use pager
27541 contrib/emacs/vc-git.el: support vc-version-other-window
27544 git-fetch: Allow fetching the remote HEAD
27546 Shawn O. Pearce (6):
27547 Remove unnecessary found variable from describe.
27548 Teach git-describe to display distances from tags.
27549 Compute accurate distances in git-describe before output.
27550 Teach for-each-ref about a little language called Tcl.
27551 Don't coredump on bad refs in update-server-info.
27552 Escape --upload-pack from expr.
27554 Simon 'corecode' Schubert (1):
27555 Replace perl code with pure shell code
27558 Rename git-repo-config to git-config.
27560 Uwe Kleine-König (2):
27561 rename --exec to --upload-pack for fetch-pack and peek-remote
27562 make --upload-pack option to git-fetch configurable
27565 Version v1.5.0-rc2; changes since v1.5.0-rc1:
27566 ---------------------------------------------
27569 git-revert: Fix die before git-sh-setup defines it.
27571 Chris Wedgwood (1):
27572 cache.h; fix a couple of prototypes
27575 Shell syntax fix in git-reset
27576 Document --ignore-if-in-upstream in git-format-patch
27579 gitk: add current directory to main window title
27582 git-svn: fix tests to work with older svn
27583 git-svn: print and flush authentication prompts to STDERR
27586 Start all test scripts with /bin/sh.
27587 Set _ALL_SOURCE for AIX, but avoid its struct list.
27588 Replace "echo -n" with printf in shell scripts.
27589 Solaris 5.8 returns ENOTDIR for inappropriate renames.
27592 git-pull: disallow implicit merging to detached HEAD
27594 Johannes Schindelin (9):
27595 Fix spurious compile error
27596 config_set_multivar(): disallow newlines in keys
27597 show_date(): fix relative dates
27598 apply --cached: fix crash in subdirectory
27599 Do not verify filenames in a bare repository
27600 Teach the revision walker to walk by reflogs with --walk-reflogs
27601 --walk-reflogs: disallow uninteresting commits
27602 --walk-reflogs: actually find the right commit by date.
27603 --walk-reflogs: do not crash with cyclic reflog ancestry
27605 Junio C Hamano (69):
27606 reflog-expire: brown paper bag fix.
27607 merge-recursive: do not report the resulting tree object name
27608 Explain "Not a git repository: '.git'".
27610 Make git-prune-packed a bit more chatty.
27611 Define cd_to_toplevel shell function in git-sh-setup
27612 Use cd_to_toplevel in scripts that implement it by hand.
27613 Allow whole-tree operations to be started from a subdirectory
27614 Use log output encoding in --pretty=email headers.
27615 t3901: test "format-patch | am" pipe with i18n
27616 git-commit documentation: -a adds and also removes
27617 Consistent message encoding while reusing log from an existing commit.
27618 More tests in t3901.
27619 git log documentation: teach -<n> form.
27621 Documentation: merge-output is not too verbose now.
27622 Use merge-recursive in git-revert/git-cherry-pick
27623 git reflog expire: document --stale-fix option.
27624 Fix git-fetch while on detached HEAD not to give needlessly alarming errors
27625 git-push documentation: remaining bits
27626 git-rm documentation: remove broken behaviour from the example.
27627 tutorial: shorthand for remotes but show distributed nature of git
27628 git-commit documentation: remove comment on unfixed git-rm
27629 Use merge-recursive in git-checkout -m (branch switching)
27630 Document where configuration files are in config.txt
27631 git-commit: document log message formatting convention
27632 Documentation/SubmittingPatches: Gnus tips
27633 Documentation/git-tag: the command can be used to also verify a tag.
27634 Documentation/git-tools.txt: mention tig and refer to wiki
27635 Documentation/git-tar-tree.txt: default umask is now 002
27636 Documentation/git-status.txt: mention color configuration
27637 Documentation/git-whatchanged.txt: show -<n> instead of --max-count.
27638 Documentation/git-sh-setup.txt: programmer's docs
27639 Documentation: detached HEAD
27640 Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
27641 Documentation: describe shallow repository
27642 Documentation/glossary.txt: unpacked objects are loose.
27643 Documentation/glossary.txt: describe remotes/ tracking and packed-refs
27644 Introduce 'git-format-patch --suffix=.patch'
27645 git-format-patch: do not crash with format.headers without value.
27646 Documentation/git-resolve: deprecated.
27647 Documentation: suggest corresponding Porcelain-level in plumbing docs.
27648 Documentation: m can be relative in "git-blame -Ln,m"
27649 Documentation/git-parse-remote.txt: we deal with config vars as well
27650 git-format-patch -3
27651 Add --summary to git-format-patch by default
27652 git-format-patch: make --binary on by default
27653 git-format-patch: the default suffix is now .patch, not .txt
27654 Use fixed-size integers for .idx file I/O
27655 Documentation: move command list in git.txt into separate files.
27656 Documentation: sync git.txt command list and manual page title
27657 Documentation: Generate command lists.
27658 for_each_reflog_ent: do not leak FILE *
27659 refs.c::read_ref_at(): fix bogus munmap() call.
27660 Documentation: generated cmds-*.txt does not depend on git.txt
27661 Documentation/git.txt: command re-classification
27662 dwim_ref(): Separate name-to-ref DWIM code out.
27663 Extend read_ref_at() to be usable from places other than sha1_name.
27664 show-branch --reflog: show the reflog message at the top.
27665 show-branch --reflog: tighten input validation.
27666 show-branch --reflog: fix show_date() call
27667 Stop ignoring Documentation/README
27668 git-tag -d: allow deleting multiple tags at once.
27669 branch -f: no reason to forbid updating the current branch in a bare repo.
27670 git-rebase: allow rebasing a detached HEAD.
27671 log --walk-reflog: documentation
27672 reflog-walk: build fixes
27673 Fix --walk-reflog with --pretty=oneline
27676 Linus Torvalds (2):
27677 Clean up write_in_full() users
27678 Fix up totally buggered read_or_die()
27680 Matthias Lederhofer (2):
27681 prune-packed: add -q to usage
27682 prune: --grace=time
27684 Michael S. Tsirkin (1):
27685 fix documentation for git-commit --no-verify
27688 use 'init' instead of 'init-db' for shipped docs and tools
27689 simplify the "no changes added to commit" message
27691 sanitize content of README file
27694 Make gitk work when launched in a subdirectory
27697 git-remote: no longer silent on unknown commands.
27700 Documentation: a few spelling fixes
27703 tutorial: Use only separate layout
27705 Shawn O. Pearce (18):
27706 Improve merge performance by avoiding in-index merges.
27707 Hide output about SVN::Core not being found during tests.
27708 Remove read_or_die in favor of better error messages.
27709 Remove unnecessary call_depth parameter in merge-recursive.
27710 Allow the user to control the verbosity of merge-recursive.
27711 Enable output buffering in merge-recursive.
27712 Display a progress meter during merge-recursive.
27713 Convert output messages in merge-recursive to past tense.
27714 Always perfer annotated tags in git-describe.
27715 Hash tags by commit SHA1 in git-describe.
27716 Use binary searching on large buckets in git-describe.
27717 Improve git-describe performance by reducing revision listing.
27718 Correct priority of lightweight tags in git-describe.
27719 Remove hash in git-describe in favor of util slot.
27720 Use nice names in conflict markers during cherry-pick/revert.
27721 Document the master@{n} reflog query syntax.
27722 Refer users to git-rev-parse for revision specification syntax.
27723 Document pack .idx file format upgrade strategy.
27725 Simon 'corecode' Schubert (2):
27726 Use fixed-size integers for the on-disk pack structure.
27727 Use standard -t option for touch.
27729 Uwe Kleine-König (4):
27730 document --exec for git-push
27731 Update documentation of fetch-pack, push and send-pack
27732 make --exec=... option to git-push configurable
27733 rename --exec to --receive-pack for push and send-pack
27736 Version v1.5.0-rc1; changes since v1.5.0-rc0:
27737 ---------------------------------------------
27740 Speed-up recursive by flushing index only once for all entries
27742 Alexandre Julliard (12):
27743 Shallow clone: do not ignore shallowness when following tags
27744 fetch-pack: Properly remove the shallow file when it becomes empty.
27745 upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
27746 git-fetch: Reset shallow_depth before auto-following tags.
27747 get_shallow_commits: Avoid memory leak if a commit has been reached already.
27748 fetch-pack: Do not fetch tags for shallow clones.
27749 git-clean: Fix the -q option.
27750 git.el: Don't use --info-only when resolving a file.
27751 git.el: Avoid setting font lock keywords before entering log-edit mode.
27752 git-apply: Remove directories that have become empty after deleting a file.
27753 git-clone: Make sure the master branch exists before running cat on it.
27754 git.el: Define the propertize function if needed, for XEmacs compatibility.
27757 hooks/commit-msg: add example to add Signed-off-by line to message
27759 Andy Whitcroft (6):
27760 send pack check for failure to send revisions list
27761 ssh-upload: prevent buffer overrun
27762 short i/o: clean up the naming for the write_{in,or}_xxx family
27763 short i/o: fix calls to read to use xread or read_in_full
27764 short i/o: fix calls to write to use xwrite or write_in_full
27765 short i/o: fix config updates to use write_in_full
27767 Brian Gernhardt (3):
27768 Add documentation for git-branch's color configuration.
27769 Ignore git-init and git-remote
27770 Auto-quote config values in config.c:store_write_pair()
27773 git-svn: quiet down tests and fix some unportable shell constructs
27774 git-svn: dcommit should diff against the current HEAD after committing
27775 t6024-recursive-merge: quiet down this test
27776 test-lib: quiet down init-db output for tests
27777 t9200-git-cvsexportcommit.sh: quiet down commit
27778 git-svn: remove non-delta fetch code paths
27779 git-svn: print out the SVN library version in --version, too
27780 git-svn: verify_ref() should actually --verify
27781 git-svn: sort multi-init output
27782 git-svn: remove svnadmin dependency from the tests
27783 git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
27784 git-svn: t/t91??-*: optimize the tests a bit
27785 instaweb: load Apache mime and dir modules if they are needed
27786 git-svn: make multi-init less confusing
27787 git-svn: update documentation for multi-{init|fetch}
27788 git-svn: make --repack work consistently between fetch and multi-fetch
27789 Documentation/git-svn: clarify dcommit, rebase vs pull/merge
27790 git-svn: fix show-ignore
27791 git-svn: add --prefix= option to multi-init
27792 git-svn: pass an unambiguous ref to rev-list when grafting-branches
27793 Avoid errors and warnings when attempting to do I/O on zero bytes
27795 Fredrik Kuivinen (1):
27796 instaweb: Nicer error message when the http daemon isn't found
27798 J. Bruce Fields (9):
27799 Docs: update cvs-migration.txt to reflect clone's new default behavior
27800 Documentation: update git-clone.txt for clone's new default behavior
27801 Documentation: update glossary entry for "origin"
27802 Documentation: update tutorial's discussion of origin
27803 Documentation: update git-pull.txt for new clone behavior
27804 Documentation: remove master:origin example from pull-fetch-param.txt
27805 Documentation: tutorial editing
27806 Documentation: clarify definition of "reachable"
27807 Documentation: add git-remote man page
27809 Jakub Narebski (14):
27810 gitweb: Add mod_perl version string to "generator" meta header
27811 gitweb: Precompile CGI routines for mod_perl
27812 Add info about new test families (8 and 9) to t/README
27813 gitweb: Fix error in git_project_index subroutine
27814 gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
27815 gitweb: There can be empty patches (in git_patchset_body)
27816 gitweb: Fix "Use of uninitialized value" warning in git_tags_body
27817 gitweb: Fix error in git_patchest_body for file creation/deletion patch
27818 gitweb: Fix error in "rename to"/"copy to" git diff header output
27819 gitweb: Fix errors in git_patchset_body for empty patches
27820 Revert "gitweb: There can be empty patches (in git_patchset_body)"
27821 gitweb: Fix split patches output (e.g. file to symlink)
27822 gitweb: Remove superfluous "|" in "commit" view
27823 gitweb: Fix git_patchset_body not closing <div class="patch">
27826 get_tree_entry: map blank requested entry to tree root
27829 update hook: redirect _both_ diagnostic lines to stderr upon tag failure
27831 Johannes Schindelin (9):
27832 upload-pack: no longer call rev-list
27833 support fetching into a shallow repository
27834 allow cloning a repository "shallowly"
27835 allow deepening of a shallow repository
27836 add tests for shallow stuff
27837 xdl_merge(): fix a segmentation fault when refining conflicts
27838 Fix yet another subtle xdl_merge() bug
27839 Sanitize for_each_reflog_ent()
27840 Fix t1410 for core.filemode==false
27842 Junio C Hamano (106):
27843 We should make sure that the protocol is still extensible.
27844 Why does it mean we do not have to register shallow if we have one?
27845 Why didn't we mark want_obj as ~UNINTERESTING in the old code?
27846 shallow clone: unparse and reparse an unshallowed commit
27847 add for_each_reflog_ent() iterator
27848 Protect commits recorded in reflog from pruning.
27849 Teach git-repack to preserve objects referred to by reflog entries.
27850 reflog: fix warning message.
27851 Move in_merge_bases() to commit.c
27853 reflog expire: prune commits that are not incomplete
27854 reflog expire: do not punt on tags that point at non commits.
27855 show-branch --reflog: add documentation.
27856 Document --numstat in git-apply and git-diff
27857 Document git-reset <commit> -- <paths>...
27858 Move encoding conversion routine out of mailinfo to utf8.c
27859 i18n.logToUTF8: convert commit log message to UTF-8
27860 Teach log family --encoding
27861 everyday: update for v1.5.0
27862 count-objects -v: show number of packs as well.
27863 rerere gc: honor configuration and document it
27864 git-reflog: gc.* configuration and documentation.
27865 everyday: replace a few 'prune' and 'repack' with 'gc'
27866 Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
27867 Set NO_MMAP for Cygwin by default
27868 UTF-8: introduce i18n.logoutputencoding.
27869 gcc does not necessarily pass runtime libpath with -R
27870 Work around http-fetch built with cURL 7.16.0
27871 Rename t3900 test vector file
27872 t3900: test conversion to non UTF-8 as well
27873 GIT_SKIP_TESTS: allow users to omit tests that are known to break
27874 core.logallrefupdates: log remotes/ tracking branches.
27875 Allow non-fast-forward of remote tracking branches in default clone
27876 t5400 send-pack test: try a bit more nontrivial transfer.
27877 Revert "read_directory: show_both option."
27878 Fix 'git add' with .gitignore
27879 pack-objects: fix use of use_pack().
27880 mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
27881 send-pack: fix pipeline.
27882 Documentation: illustrate send-pack pipeline.
27883 commit re-encoding: fix confusion between no and default conversion.
27884 t3900: test log --encoding=none
27885 Documentation: i18n commit log message notes.
27886 Documentation: minor rewording for git-log and git-show pages.
27887 Move commit reencoding parameter parsing to revision.c
27888 commit-tree: cope with different ways "utf-8" can be spelled.
27889 i18n: drop "encoding" header in the output after re-coding.
27890 Documentation/config.txt (and repo-config manpage): mark-up fix.
27891 Update documentation for update hook.
27892 send-pack.c: use is_null_sha1()
27893 send-pack: tell pack-objects to use its internal rev-list.
27894 Do not merge random set of refs out of wildcarded refs
27895 i18n: do not leak 'encoding' header even when we cheat the conversion.
27896 Update send-pack pipeline documentation.
27897 fail pull/merge early in the middle of conflicted merge
27898 git-fetch: remove .keep file at the end.
27899 Strongly discourage --update-head-ok in fetch-options documentation.
27900 Update clone/fetch documentation with --depth (shallow clone) option
27901 Remove unused variable (git-commit.sh)
27902 fetch-pack: do not use lockfile structure on stack.
27903 Fix infinite loop when deleting multiple packed refs.
27904 tutorial: misc updates.
27905 git-verify-tag: make sure we remove temporary file.
27906 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
27907 rerere: Fix removal of already resolved path.
27909 builtin-prune: memory diet.
27910 Fix timestamp for test-tick
27911 builtin-prune: make file-scope static struct to an argument.
27912 builtin-prune: separate ref walking from reflog walking.
27913 Move traversal of reachable objects into a separate library.
27914 reflog expire --fix-stale
27915 reflog --fix-stale: do not check the same trees and commits repeatedly.
27916 diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
27917 git-reset <tree> -- <path> restores absense of <path> in <tree>
27918 Spell default packedgitlimit slightly differently
27919 Move initialization of log_all_ref_updates
27920 Introduce is_bare_repository() and core.bare configuration variable
27921 git-fetch: allow updating the current branch in a bare repository.
27922 git-status: show detached HEAD
27923 Detached HEAD (experimental)
27924 git-checkout: do not warn detaching HEAD when it is already detached.
27925 git-checkout: rewording comments regarding detached HEAD.
27926 git-checkout: safety when coming back from the detached HEAD state.
27927 git-checkout: fix branch name output from the command
27928 --utf8 is now default for 'git-am'
27929 --prune is now default for 'pack-refs'
27930 rm git-rerere.perl -- it is now a built-in.
27931 merge-base: do not leak commit list
27932 Do not ignore a detected patchfile brokenness.
27933 Fix "Do not ignore a detected patchfile brokenness."
27934 builtin-archive: do not free a tree held by the object layer.
27935 git-checkout: safety check for detached HEAD checks existing refs
27936 git-checkout: handle local changes sanely when detaching HEAD
27937 git-am: should work when "--no-utf8 --utf8" is given
27938 -u is now default for 'git-applymbox'
27939 -u is now default for 'git-mailinfo'.
27940 Makefile: remove $foo when $foo.exe is built/installed.
27941 merge-recursive: do not use on-file index when not needed.
27943 index-pack: write-or-die instead of unchecked write-in-full.
27944 config-set: check write-in-full returns in set_multivar
27945 git-rm: do not fail on already removed file.
27946 git-status: wording update to deal with deleted files.
27947 plug a few leaks in revision walking used in describe.
27951 Clarify syntax and role of git-add in status output
27952 Improve "nothing to commit" part of status output
27953 Support --amend on initial commit in status output
27954 Improve cached content header of status output
27955 Remove unnecessary git-rm --cached reference from status output
27956 send-email: work around double encoding of in-body From field.
27957 Provide better feedback for the untracked only case in status output
27960 Skip excessive blank lines before commit body
27961 Refactor print-functions in builtin-branch
27962 git-branch: show detached HEAD
27964 Linus Torvalds (3):
27965 write-cache: do not leak the serialized cache-tree data.
27966 write_in_full: really write in full or return error on disk full.
27967 Better error messages for corrupt databases
27970 Blame "linenr" link jumps to previous state at "orig_lineno"
27972 Martin Langhoff (6):
27973 cvsimport: skip commits that are too recent
27974 cvsimport: skip commits that are too recent (option and documentation)
27975 cvsimport: document -S and -L options
27976 cvsimport: cleanup temporary cvsps file
27977 cvsserver: detect early of we are up to date and avoid costly rev-list
27978 cvsserver: fix revision number during file adds
27980 Michael Loeffler (1):
27981 git-commit: do not fail to print the diffstat even if there is a file named HEAD
27984 add .mailmap for git-shortlog output with the git repository
27985 Add git-reflog to .gitignore
27986 move git-blame to its place in .gitignore
27987 "init-db" can really be just "init"
27988 Add git-init documentation.
27991 Fix warnings in sha1_file.c - use C99 printf format if available
27994 git-send-email: default value for "From:" field.
27997 Make check target depend on common-cmds.h
27998 Remove shadowing variable from traverse_trees()
27999 Set default "tar" umask to 002 and owner.group to root.root
28001 Robert Fitzsimons (2):
28002 gitweb: Re-enable rev-list --parents for parse_commit.
28003 gitweb: Fix shortlog only showing HEAD revision.
28006 Documentation/tutorial: misc updates
28007 git-tag: add flag to verify a tag
28009 Sasha Khapyorsky (3):
28010 git-svnimport: support for incremental import
28011 git-svnimport: clean svn path when accessing SVN repo
28012 git-svnimport: fix edge revisions double importing
28014 Shawn O. Pearce (49):
28015 Don't crash during repack of a reflog with pruned commits.
28016 Create 'git gc' to perform common maintenance operations.
28017 Use GIT_REFLOG_ACTION environment variable instead.
28018 Honor GIT_REFLOG_ACTION in git-rebase.
28019 Use branch names in 'git-rebase -m' conflict hunks.
28020 Ensure `git-pull` fails if `git-merge` fails.
28021 Honor pull.{twohead,octopus} in git-merge.
28022 Allow git-merge to select the default strategy.
28023 Move better_branch_name above get_ref in merge-recursive.
28024 Allow merging bare trees in merge-recursive.
28025 Use merge-recursive in git-am -3.
28026 Replace unpack_entry_gently with unpack_entry.
28027 Introduce new config option for mmap limit.
28028 Refactor packed_git to prepare for sliding mmap windows.
28029 Use off_t for index and pack file lengths.
28030 Create read_or_die utility routine.
28031 Refactor how we open pack files to prepare for multiple windows.
28032 Replace use_packed_git with window cursors.
28033 Loop over pack_windows when inflating/accessing data.
28034 Document why header parsing won't exceed a window.
28035 Unmap individual windows rather than entire files.
28036 Fully activate the sliding window pack access.
28037 Load core configuration in git-verify-pack.
28038 Ensure core.packedGitWindowSize cannot be less than 2 pages.
28039 Improve error message when packfile mmap fails.
28040 Support unmapping windows on 'temporary' packfiles.
28041 Create pack_report() as a debugging aid.
28042 Test suite for sliding window mmap implementation.
28043 Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
28044 Release pack windows before reporting out of memory.
28045 Replace mmap with xmmap, better handling MAP_FAILED.
28046 Cleanup read_cache_from error handling.
28047 Fix random segfaults in pack-objects.
28048 Force core.filemode to false on Cygwin.
28049 Use PATH_MAX constant for --bare.
28050 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
28051 Automatically detect a bare git repository.
28052 Remove unnecessary argc parameter from run_command_v.
28053 Redirect update hook stdout to stderr.
28054 Use /dev/null for update hook stdin.
28055 Teach Git how to parse standard power of 2 suffixes.
28056 Update packedGit config option documentation.
28057 Add test case for update hooks in receive-pack.
28058 Increase packedGit{Limit,WindowSize} on 64 bit systems.
28059 Don't die in git-http-fetch when fetching packs.
28060 Don't save the commit buffer in git-describe.
28061 Make git-describe a builtin.
28062 Disallow working directory commands in a bare repository.
28063 Chose better tag names in git-describe after merges.
28065 Stefan-W. Hahn (1):
28066 Replacing the system call pread() with lseek()/xread()/lseek() sequence.
28069 Describe git-clone's actual behavior in the summary
28070 Print a more accurate error message when we fail to create a lock file.
28071 Update git-svn manpage to remove the implication that SVN::* is optional.
28074 Fix formatting for urls section of fetch, pull, and push manpages
28075 Fix formatting for urls section of fetch, pull, and push manpages
28078 Version v1.5.0-rc0; changes since v1.4.4.4:
28079 -------------------------------------------
28082 Make perl/ build procedure ActiveState friendly.
28084 Alexandre Julliard (1):
28085 vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
28087 Andreas Ericsson (2):
28088 ls-files: Give hints when errors happen.
28089 git-diff: Introduce --index and deprecate --cached.
28092 Improve git-prune -n output
28093 Add support to git-branch to show local and remote branches
28094 Use .git/config for storing "origin" shortcut repository
28095 De-emphasise the symbolic link documentation.
28096 Explicitly add the default "git pull" behaviour to .git/config on clone
28097 Colourise git-branch output
28098 Allow subcommand.color and color.subcommand color configuration
28099 git-status always says what branch it's on
28101 Aneesh Kumar K.V (1):
28102 Add config example with respect to branch
28104 Brian Gernhardt (6):
28105 Add --add option to git-repo-config
28106 Make git-diff documentation use [--] when it should.
28107 Add documentation for show-branch --topics
28108 Remove COLLISION_CHECK from Makefile since it's not used.
28109 Keep "git --git-dir" from causing a bus error.
28110 Make git-show-branch options similar to git-branch.
28112 David S. Miller (1):
28113 Pass -M to diff in request-pull
28116 git-svn: handle authentication without relying on cached tokens on disk
28117 git-svn: correctly access repos when only given partial read permissions
28118 git-svn: exit with status 1 for test failures
28119 git-svn: allow SVN:: lib users to track the root of the repository (again)
28120 git-svn: use ~/.subversion config files when using SVN:: libraries
28121 git-svn: enable delta transfers during fetches when using SVN:: libs
28122 git-svn: update tests for recent changes
28123 git-svn: error out when the SVN connection fails during a fetch
28124 git-svn: fix output reporting from the delta fetcher
28125 git-svn: color support for the log command
28126 git-svn: documentation updates
28127 git-svn: fix multi-init
28128 git-svn: avoid network timeouts for long-running fetches
28129 git-svn: extra error check to ensure we open a file correctly
28130 git-svn: use do_switch for --follow-parent if the SVN library supports it
28131 rerere: add clear, diff, and status commands
28132 rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
28133 git-svn: enable logging of information not supported by git
28134 git-svn: allow dcommit to take an alternate head
28135 git-svn: correctly display fatal() error messages
28136 git-svn: correctly handle packed-refs in refs/remotes/
28137 git-svn: correctly handle "(no author)" when using an authors file
28138 git-svn: convert to using Git.pm
28139 git-svn: remove support for the svn command-line client
28140 git-svn: rename 'commit' command to 'set-tree'
28141 git-cvsserver: fix breakage when calling git merge-file
28142 Remove NO_ACCURATE_DIFF options from build systems
28143 git-svn: enable common fetch/commit options for dcommit
28144 Makefile: add quick-install-doc for installing pre-built manpages
28146 Han-Wen Nienhuys (2):
28147 git-tag: allow empty tag message if -m is given explicitly.
28148 ident.c: Trim hint printed when gecos is empty.
28151 git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
28153 J. Bruce Fields (5):
28154 Documentation: clarify tutorial pull/merge discussion
28155 cvs-migration: improved section titles, better push/commit explanation
28156 Documentation: reorganize cvs-migration.txt
28157 Documentation: update git-clone man page with new behavior
28158 Documentation: simpler shared repository creation
28160 Jakub Narebski (26):
28161 gitweb: Protect against possible warning in git_commitdiff
28162 gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
28163 gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
28164 gitweb: New improved formatting of chunk header in diff
28165 gitweb: Add an option to href() to return full URL
28166 gitweb: Refactor feed generation, make output prettier, add Atom feed
28167 gitweb: Finish restoring "blob" links in git_difftree_body
28168 gitweb: Replace SPC with also in tag comment
28169 gitweb: Do not use esc_html in esc_path
28170 gitweb: Use git-show-ref instead of git-peek-remote
28171 gitweb: Add author and committer email extraction to parse_commit
28172 gitweb: Add author and contributor email to Atom feed
28173 gitweb: Use author_epoch for pubdate in gitweb feeds
28174 gitweb: Make project description in projects list link to summary view
28175 gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
28176 git-clone: Rename --use-immingled-remote option to --no-separate-remote
28177 Document git-diff whitespace flags -b and -w
28178 gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
28179 gitweb: Don't use Content-Encoding: header in git_snapshot
28180 gitweb: Show target of symbolic link in "tree" view
28181 gitweb: Add generic git_object subroutine to display object of any type
28182 gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
28183 gitweb: SHA-1 in commit log message links to "object" view
28184 gitweb: Do not show difftree for merges in "commit" view
28185 gitweb: Add title attribute to ref marker with full ref name
28186 gitweb: Add "next" link to commit view
28189 shortlog: fix segfault on empty authorname
28190 vim syntax: follow recent changes to commit template
28193 Set permissions of each new file before "cvs add"ing it.
28195 Johannes Schindelin (30):
28197 shortlog: do not crash on parsing "[PATCH"
28198 shortlog: read mailmap from ./.mailmap again
28199 shortlog: handle email addresses case-insensitively
28201 shortlog: use pager
28202 sha1_object_info(): be consistent with read_sha1_file()
28203 xdiff: add xdl_merge()
28204 xdl_merge(): fix an off-by-one bug
28205 xdl_merge(): fix thinko
28206 diff -b: ignore whitespace at end of line
28207 xdl_merge(): fix and simplify conflict handling
28208 cvs-migration document: make the need for "push" more obvious
28209 Add builtin merge-file, a minimal replacement for RCS merge
28210 merge-file: support -p and -q; fix compile warnings
28211 Get rid of the dependency on RCS' merge program
28212 merge-recursive: add/add really is modify/modify with an empty base
28213 INSTALL: no need to have GNU diff installed
28214 git-show: grok blobs, trees and tags, too
28215 Document git-merge-file
28216 add a function to rename sections in the config
28217 git-branch: rename config vars branch.<branch>.*, too
28218 Introduce GIT_TEMPLATE_DIR
28219 Use git-merge-file in git-merge-one-file, too
28220 git-tag: support -F <file> option
28221 git-reset --hard: tell the user what the HEAD was reset to
28222 move read_mmfile() into xdiff-interface
28223 Add a test for git-rerere
28224 Make git-rerere a builtin
28225 commit-tree: encourage UTF-8 commit messages.
28227 Josef Weidendorfer (2):
28228 Add branch.*.merge warning and documentation update
28229 Move "no merge candidate" warning into git-pull
28231 Junio C Hamano (115):
28232 upload-pack: stop the other side when they have more roots than we do.
28233 apply --numstat: mark binary diffstat with - -, not 0 0
28234 pack-objects: tweak "do not even attempt delta" heuristics
28235 Store peeled refs in packed-refs file.
28236 remove merge-recursive-old
28237 git-merge: make it usable as the first class UI
28238 merge: allow merging into a yet-to-be-born branch.
28239 Store peeled refs in packed-refs (take 2).
28240 git-fetch: reuse ls-remote result.
28241 git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
28242 git-fetch: allow glob pattern in refspec
28243 refs outside refs/{heads,tags} match less strongly.
28244 Typefix builtin-prune.c::prune_object()
28245 Allow git push to delete remote ref.
28246 gitweb: (style) use chomp without parentheses consistently.
28247 git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
28248 git-branch -D: make it work even when on a yet-to-be-born branch
28249 git-shortlog: fix common repository prefix abbreviation.
28250 git-shortlog: make common repository prefix configurable with .mailmap
28251 git-commit: show --summary after successful commit.
28252 git-fetch: exit with non-zero status when fast-forward check fails
28253 git-fetch: allow forcing glob pattern in refspec
28254 fetch-pack: do not barf when duplicate re patterns are given
28255 grep: do not skip unmerged entries when grepping in the working tree.
28256 git-merge: tighten error checking.
28257 git-merge: do not leak rev-parse output used for checking internally.
28258 cvsimport: style fixup.
28259 git-merge: fix confusion between tag and branch
28260 xmerge: make return value from xdl_merge() more usable.
28261 merge-recursive: use xdl_merge().
28262 read-tree: further loosen "working file will be lost" check.
28263 Loosen "working file will be lost" check in Porcelain-ish
28264 read-tree: document --exclude-per-directory
28265 git-merge: squelch needless error message.
28266 git-merge: fix "fix confusion between tag and branch" for real
28268 git-rerere: add 'gc' command.
28269 Documentation/git-commit: rewrite to make it more end-user friendly.
28270 git-commit: allow --only to lose what was staged earlier.
28271 shortlog: remove "[PATCH]" prefix from shortlog output
28272 shortlog: fix segfault on empty authorname
28273 diff --numstat: show binary with '-' to match "apply --numstat"
28274 add test case for recursive merge
28275 git-push: document removal of remote ref with :<dst> pathspec
28276 Revert "git-diff: Introduce --index and deprecate --cached."
28277 git merge: reword failure message.
28278 spurious .sp in manpages
28279 git-push: accept tag <tag> as advertised.
28280 send-pack: tighten checks for remote names
28281 branch --color: change default color selection.
28282 git-blame: show lines attributed to boundary commits differently.
28283 config documentation: group color items together.
28284 git-svn: allow both diff.color and color.diff
28285 Update git-diff documentation
28286 git-fetch: make it work from within a subdirectory.
28287 git-reset: make it work from within a subdirectory.
28288 git-reset [--mixed] <tree> [--] <paths>...
28289 merge: give a bit prettier merge message to "merge branch~$n"
28290 git-clone: use wildcard specification for tracking branches
28291 git-pull: refuse default merge without branch.*.merge
28292 git-clone: lose the artificial "first" fetch refspec
28293 git-clone: lose the traditional 'no-separate-remote' layout
28294 update-index: make D/F conflict error a bit more verbose.
28295 git-add: remove conflicting entry when adding.
28296 Fix check_file_directory_conflict().
28297 Fix mis-mark-up in git-merge-file.txt documentation
28298 markup fix in svnimport documentation.
28299 rev-list --left-right
28300 Teach all of log family --left-right output.
28301 Make left-right automatic.
28302 Teach show-branch how to show ref-log data.
28303 git-fetch: Avoid reading packed refs over and over again
28304 avoid accessing _all_ loose refs in git-show-ref --verify
28305 show-ref: fix --quiet --verify
28306 show-ref: fix --verify --hash=length
28307 parse-remote::expand_refs_wildcard()
28308 show-ref: fix --exclude-existing
28309 racy-git: documentation updates.
28310 rerere: fix breakage of resolving.
28311 fix testsuite: make sure they use templates freshly built from the source
28312 Teach git-branch to delete tracking branches with -r -d
28313 blame: -b (blame.blankboundary) and --root (blame.showroot)
28314 git-add --interactive
28315 git-add --interactive: hunk splitting
28316 Revert "fix testsuite: make sure they use templates freshly built from the source"
28317 Do not create $GIT_DIR/remotes/ directory anymore.
28318 Use preprocessor constants for environment variable names.
28319 Revert "Make left-right automatic."
28320 fix populate-filespec
28321 config_rename_section: fix FILE* leak
28322 simplify inclusion of system header files.
28323 revision: --skip=<n>
28324 git-add: error out when given no arguments.
28325 compat/inet_ntop: do not use u_int
28326 diff documentation: mostly talk about <commit>
28327 Revert "git-pull: refuse default merge without branch.*.merge"
28328 parse-remote: mark all refs not for merge only when fetching more than one
28329 _XOPEN_SOURCE problem also exists on FreeBSD
28330 commit-tree: do not overflow MAXPARENT
28331 merge and reset: adjust for "reset --hard" messages
28332 default pull: forget about "newbie protection" for now.
28333 Do not support "partial URL shorthand" anymore.
28334 Really fix headers for __FreeBSD__
28335 git-tag: lose exit after die
28336 Allow branch.*.merge to talk about remote tracking branches.
28337 git-add --interactive: add documentation
28338 match_pathspec() -- return how well the spec matched
28339 git-rm: update to saner semantics
28340 t3600: update the test for updated git rm
28341 git-rm: Documentation
28342 read_directory: show_both option.
28343 git-add: add ignored files when asked explicitly.
28344 git-add: warn when adding an ignored file with an explicit request.
28345 git-add -f: allow adding otherwise ignored files.
28349 Add -v and --abbrev options to git-branch
28350 git-branch: add options and tests for branch renaming
28351 rename_ref: use lstat(2) when testing for symlink
28352 git-branch: let caller specify logmsg
28357 Michael Loeffler (1):
28358 git-fetch: ignore dereferenced tags in expand_refs_wildcard
28360 Nicolas Pitre (11):
28361 builtin git-shortlog is broken
28362 pack-objects: remove redundent status information
28363 make 'git add' a first class user friendly interface to the index
28364 change the unpack limit treshold to a saner value
28365 repacked packs should be read-only
28366 make commit message a little more consistent and conforting
28367 make patch_delta() error cases a bit more verbose
28368 make git a bit less cryptic on fetch errors
28369 index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
28370 clarify some error messages wrt unknown object types
28371 checkout: make the message about the need for a new branch a bit clearer
28373 Paul Mackerras (1):
28374 gitk: Fix enabling/disabling of menu items on Mac OS X
28377 config option log.showroot to show the diff of root commits
28380 Make git-clone --use-separate-remote the default
28383 git-clone documentation
28384 Documentation: new option -P for git-svnimport
28385 git-branch -d: do not stop at the first failure.
28386 Documentation/git-branch: new -r to delete remote-tracking branches.
28389 shortlog: remove range check
28391 Robert Fitzsimons (17):
28392 gitweb: Show '...' links in "summary" view only if there are more items
28393 gitweb: Add missing show '...' links change.
28394 gitweb: optimize git_get_last_activity.
28395 gitweb: optimize git_shortlog_body.
28396 gitweb: optimize git_summary.
28397 gitweb: Use rev-list pattern search options.
28398 gitweb: Require a minimum of two character for the search text.
28399 gitweb: Allow search to be disabled from the config file.
28400 gitweb: Paginate commit/author/committer search output
28401 gitweb: Add parse_commits, used to bulk load commit objects.
28402 gitweb: We do longer need the --parents flag in rev-list.
28403 gitweb: Change summary, shortlog actions to use parse_commits.
28404 gitweb: Change log action to use parse_commits.
28405 gitweb: Change header search action to use parse_commits.
28406 gitweb: Change atom, rss actions to use parse_commits.
28407 gitweb: Change history action to use parse_commits.
28408 gitweb: Use rev-list --skip option.
28410 Robin Rosenberg (1):
28411 Make cvsexportcommit work with filenames with spaces and non-ascii characters.
28413 Sean Estabrooks (1):
28414 Update documentation to remove incorrect GIT_DIFF_OPTS example.
28416 Shawn O. Pearce (30):
28417 Teach git-completion.bash how to complete git-merge.
28418 Hide plumbing/transport commands from bash completion.
28419 Teach bash how to complete options for git-name-rev.
28420 Add current branch in PS1 support to git-completion.bash.
28421 Teach bash how to complete git-format-patch.
28422 Teach bash how to complete git-cherry-pick.
28423 Teach bash how to complete git-rebase.
28424 Teach bash about git log/show/whatchanged options.
28425 Support bash completion of refs/remote.
28426 Teach bash about git-repo-config.
28427 Support --strategy=x completion in addition to --strategy x.
28428 Cache the list of merge strategies and available commands during load.
28429 Teach bash about git-am/git-apply and their whitespace options.
28430 Teach bash how to complete long options for git-commit.
28431 Fix broken bash completion of local refs.
28432 Remove uncontested renamed files during merge.
28433 Avoid accessing a slow working copy during diffcore operations.
28434 Provide more meaningful output from 'git init-db'.
28435 Enable reflogs by default in any repository with a working directory.
28436 Teach bash the new features of 'git show'.
28437 Suggest use of "git add file1 file2" when there is nothing to commit.
28438 Align section headers of 'git status' to new 'git add'.
28439 Default GIT_COMMITTER_NAME to login name in recieve-pack.
28440 Suggest 'add' in am/revert/cherry-pick.
28441 Rename imap-send's internal info/warn functions.
28442 Introduce a global level warn() function.
28443 Use extended SHA1 syntax in merge-recursive conflicts.
28444 Display 'theirs' branch name when possible in merge.
28445 Rename gitfakemmap to git_mmap.
28446 Switch git_mmap to use pread.
28448 Terje Sten Bjerkseth (1):
28449 Fix system header problems on Mac OS X
28451 Uwe Kleine-König (1):
28452 Fix documentation copy&paste typo
28455 Version v1.4.4.4; changes since v1.4.4.3:
28456 -----------------------------------------
28458 Johannes Schindelin (1):
28459 diff --check: fix off by one error
28461 Junio C Hamano (3):
28462 spurious .sp in manpages
28463 Fix infinite loop when deleting multiple packed refs.
28464 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
28467 Version v1.4.4.3; changes since v1.4.4.2:
28468 -----------------------------------------
28471 Clarify fetch error for missing objects.
28473 Brian Gernhardt (1):
28474 Move Fink and Ports check to after config file
28477 no need to install manpages as executable
28480 git-svn: exit with status 1 for test failures
28481 git-svn: correctly display fatal() error messages
28484 Don't use memcpy when source and dest. buffers may overlap
28486 Junio C Hamano (1):
28489 Martin Langhoff (1):
28490 cvsserver: Avoid miscounting bytes in Perl v5.8.x
28492 Shawn O. Pearce (2):
28493 Make sure the empty tree exists when needed in merge-recursive.
28494 Bypass expensive content comparsion during rename detection.
28497 Version v1.4.4.2; changes since v1.4.4.1:
28498 -----------------------------------------
28501 git-blame: fix rev parameter handling.
28504 Increase length of function name buffer
28505 Document git-repo-config --bool/--int options.
28508 git-svn: error out from dcommit on a parent-less commit
28509 git-svn: correctly handle revision 0 in SVN repositories
28510 git-svn: preserve uncommitted changes after dcommit
28511 git-svn: avoid fetching files twice in the same revision
28513 Johannes Schindelin (1):
28514 git-mv: search more precisely for source directory in index
28516 Junio C Hamano (5):
28517 git blame -C: fix output format tweaks when crossing file boundary.
28518 tutorial: talk about user.name early and don't start with commit -a
28519 receive-pack: do not insist on fast-forward outside refs/heads/
28520 unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
28521 git-reset to remove "$GIT_DIR/MERGE_MSG"
28524 archive-zip: don't use sizeof(struct ...)
28527 Version v1.4.4.1; changes since v1.4.4:
28528 ---------------------------------------
28530 Alexandre Julliard (1):
28531 gitweb: Put back shortlog instead of graphiclog in the project list.
28534 Move --pretty options into Documentation/pretty-formats.txt
28537 Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.
28539 Johannes Schindelin (1):
28540 Seek back to current filepos when mmap()ing with NO_MMAP
28542 Junio C Hamano (7):
28543 git-checkout: do not allow -f and -m at the same time.
28544 git-checkout: allow pathspec to recover lost working tree directory
28545 convert-objects: set _XOPEN_SOURCE to 600
28546 git-fetch: follow lightweit tags as well.
28547 do_for_each_ref: perform the same sanity check for leftovers.
28548 trust-executable-bit: fix breakage for symlinks
28551 Linus Torvalds (2):
28552 git-pull: allow pulling into an empty repository
28553 "git fmt-merge-msg" SIGSEGV
28556 archive: use setvbuf() instead of setlinebuf()
28558 Paolo Ciarrocchi (2):
28559 Teach SubmittingPatches about git-commit -s
28560 Doc: Make comment about merging in tutorial.txt more clear
28563 Fix git-for-each-refs broken for tags
28564 git-apply: Documentation typo fix
28565 Documentation: Define symref and update HEAD description
28566 Documentation: Correct alternates documentation, document http-alternates
28569 sparse fix: non-ANSI function declaration
28570 sparse fix: Using plain integer as NULL pointer
28571 git-apply: slightly clean up bitfield usage
28572 Document git-runstatus
28575 Version v1.4.4; changes since v1.4.4-rc2:
28576 -----------------------------------------
28579 test-lib.sh: A command dying due to a signal is an unexpected failure.
28580 Catch errors when writing an index that contains invalid objects.
28583 git-update-index(1): fix use of quoting in section title
28585 Junio C Hamano (1):
28588 Robin Rosenberg (1):
28589 Rework cvsexportcommit to handle binary files for all cases.
28592 Version v1.4.4-rc2; changes since v1.4.4-rc1:
28593 ---------------------------------------------
28596 git-svn: avoid printing filenames of files we're not tracking
28597 git-svn: don't die on rebuild when --upgrade is specified
28598 git-svn: fix dcommit losing changes when out-of-date from svn
28600 Jakub Narebski (3):
28601 gitweb: Better git-unquoting and gitweb-quoting of pathnames
28602 gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
28603 gitweb: New improved patchset view
28605 Junio C Hamano (14):
28606 gitweb: fix disabling of "forks"
28607 gitweb: minimally fix "fork" support.
28608 gitweb: do not give blame link unconditionally in diff-tree view
28609 git-status: quote LF in its output
28610 git-pickaxe: retire pickaxe
28611 gitweb: protect blob and diff output lines from controls.
28612 gitweb: protect commit messages from controls.
28613 gitweb: fix unmatched div in commitdiff
28614 Documentation: move blame examples
28615 git-annotate: no need to exec blame; it is built-in now.
28616 git-annotate: fix -S on graft file with comments.
28617 path-list: fix path-list-insert return value
28618 git-cvsserver: read from git with -z to get non-ASCII pathnames.
28621 OGAWA Hirofumi (1):
28622 gitk: Fix nextfile() and add prevfile()
28625 Nicer error messages in case saving an object to db goes wrong
28627 Robert Shearman (1):
28628 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
28631 Version v1.4.4-rc1; changes since v1.4.3.5:
28632 -------------------------------------------
28635 Gitweb - provide site headers and footers
28637 Alexandre Julliard (5):
28638 pack-refs: Store the full name of the ref even when packing only tags.
28639 git.el: Added functions for moving to the next/prev unmerged file.
28640 git.el: Added a function to open the current file in another window.
28641 git.el: Move point after the log message header when entering log-edit mode.
28642 git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
28645 Make filenames line up in git-status output
28646 Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
28648 Andy Whitcroft (2):
28649 cvsimport: move over to using git-for-each-ref to read refs.
28650 git-for-each-ref: improve the documentation on scripting modes
28652 Aneesh Kumar K.V (1):
28653 gitweb: Remove extra "/" in path names for git_get_project_list
28655 Christian Couder (12):
28656 Add [-s|--hash] option to Linus' show-ref.
28657 Use Linus' show ref in "git-branch.sh".
28658 Document git-show-ref [-s|--hash] option.
28659 Fix show-ref usage for --dereference.
28660 Add pack-refs and show-ref test cases.
28661 When creating branch c/d check that branch c does not already exists.
28662 Uncomment test case: git branch c/d should barf if branch c exists.
28663 Fix a remove_empty_dir_recursive problem.
28664 Clean up "git-branch.sh" and add remove recursive dir test cases.
28665 Use git-update-ref to delete a tag instead of rm()ing the ref file.
28666 Check that a tag exists using show-ref instead of looking for the ref file.
28667 Do not create tag leading directories since git update-ref does it.
28669 Dennis Stosberg (3):
28670 lock_ref_sha1_basic does not remove empty directories on BSD
28671 Remove bashism from t3210-pack-refs.sh
28672 Bash completion support for aliases
28674 Dmitry V. Levin (1):
28675 git-clone: define die() and use it.
28678 Use memmove instead of memcpy for overlapping areas
28681 git-send-email: do not pass custom Date: header
28682 git-svn: avoid printing filenames of files we're not tracking
28683 git-svn: don't die on rebuild when --upgrade is specified
28685 Jakub Narebski (14):
28686 gitweb: Improve git_print_page_path
28687 gitweb: Add '..' (up directory) to tree view if applicable
28688 gitweb: Get rid of git_print_simplified_log
28689 gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
28690 gitweb: Print commit message without title in commitdiff only if there is any
28691 gitweb: Use --no-commit-id in git_commit and git_commitdiff
28692 Documentation: Update information about <format> in git-for-each-ref
28693 gitweb: Move git_get_last_activity subroutine earlier
28694 gitweb: Add "next" link to commitdiff view
28695 gitweb: Secure against commit-ish/tree-ish with the same name as path
28696 gitweb: Use 's' regexp modifier to secure against filenames with LF
28697 gitweb: Use git-for-each-ref to generate list of heads and/or tags
28698 gitweb: Output also empty patches in "commitdiff" view
28699 gitweb: Better support for non-CSS aware web browsers
28702 wt-status: use simplified resolve_ref to find current branch
28703 gitignore: git-pack-refs is a generated file.
28704 gitignore: git-show-ref is a generated file.
28705 git-pickaxe: work properly in a subdirectory.
28708 Don't use $author_name undefined when $from contains no /\s</.
28710 Johannes Schindelin (3):
28711 Fix git-update-index --again
28712 show-branch: mark active branch with a '*' again
28713 Turn on recursive with --summary
28716 Add man page for git-show-ref
28718 Junio C Hamano (96):
28719 Add git-for-each-ref: helper for language bindings
28720 Fix t1400-update-ref test minimally
28721 fsck-objects: adjust to resolve_ref() clean-up.
28722 symbolit-ref: fix resolve_ref conversion.
28723 Add callback data to for_each_ref() family.
28724 Tell between packed, unpacked and symbolic refs.
28725 pack-refs: do not pack symbolic refs.
28726 git-pack-refs --prune
28727 pack-refs: fix git_path() usage.
28728 lock_ref_sha1_basic: remove unused parameter "plen".
28729 Clean-up lock-ref implementation
28730 update-ref: -d flag and ref creation safety.
28731 update a few Porcelain-ish for ref lock safety.
28732 Teach receive-pack about ref-log
28733 receive-pack: call setup_ident before git_config
28735 teach revision walker about --all-match.
28736 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
28737 ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
28738 refs: minor restructuring of cached refs data.
28739 lock_ref_sha1(): do not sometimes error() and sometimes die().
28740 lock_ref_sha1(): check D/F conflict with packed ref when creating.
28741 delete_ref(): delete packed ref
28742 git-branch: remove D/F check done by hand.
28743 show-ref --hash=len, --abbrev=len, and --abbrev
28744 git-fetch: adjust to packed-refs.
28745 Fix refs.c;:repack_without_ref() clean-up path
28746 gitweb: make leftmost column of blame less cluttered.
28747 git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
28748 pack-refs: use lockfile as everybody else does.
28749 gitweb: prepare for repositories with packed refs.
28750 Revert 954a6183756a073723a7c9fd8d2feb13132876b0
28751 pack-refs: call fflush before fsync.
28752 blame.c: whitespace and formatting clean-up.
28753 git-blame: --show-name (and -f)
28754 git-blame: --show-number (and -n)
28755 blame.c: move code to output metainfo into a separate function.
28756 git-send-email: do not drop custom headers the user prepared
28757 ref-log: allow ref@{count} syntax.
28758 git-send-email: real name with period need to be dq-quoted on From: line
28759 git-blame --porcelain
28760 gitweb: use blame --porcelain
28761 Make git-send-email detect mbox-style patches more readily
28762 core.logallrefupdates create new log file only for branch heads.
28763 git-pack-refs --all
28764 core.logallrefupdates thinko-fix
28765 pack-objects: document --delta-base-offset option
28766 blame: Document and add help text for -f, -n, and -p
28767 gitweb: spell "blame --porcelain" with -p
28768 git-repack: repo.usedeltabaseoffset
28770 gitweb: use for-each-ref to show the latest activity across branches
28771 ref-log: fix D/F conflict coming from deleted refs.
28772 git-pickaxe: blame rewritten.
28773 git-pickaxe -M: blame line movements within a file.
28774 git-pickaxe -C: blame cut-and-pasted lines.
28775 git-pickaxe: pagenate output by default.
28776 git-pickaxe: fix nth_line()
28777 git-pickaxe: improve "best match" heuristics
28778 git-pickaxe: introduce heuristics to avoid "trivial" chunks
28779 git-pickaxe: do not keep commit buffer.
28780 git-pickaxe: do not confuse two origins that are the same.
28781 git-pickaxe: get rid of wasteful find_origin().
28782 git-pickaxe: swap comparison loop used for -C
28783 sha1_name.c: avoid compilation warnings.
28784 t3200: git-branch testsuite update
28785 tests: merge-recursive is usable without Python
28786 merge: loosen overcautious "working file will be lost" check.
28787 merge-recursive: use abbreviated commit object name.
28788 merge-recursive: make a few functions static.
28789 merge-recursive: adjust to loosened "working file clobbered" check
28790 t6022: ignoring untracked files by merge-recursive when they do not matter
28791 Documentation: fix git-format-patch mark-up and link it from git.txt
28792 send-pack --keep: do not explode into loose objects on the receiving end.
28793 git-pickaxe: WIP to refcount origin structure.
28794 git-pickaxe: allow -Ln,m as well as -L n,m
28795 git-pickaxe: refcount origin correctly in find_copy_in_parent()
28796 git-pickaxe: tighten sanity checks.
28797 Revert "send-pack --keep: do not explode into loose objects on the receiving end."
28798 git-pickaxe: split find_origin() into find_rename() and find_origin().
28799 git-pickaxe: cache one already found path per commit.
28800 Introduce a new revision set operator <rev>^!
28801 branch: work in subdirectories.
28802 for-each-ref: "creator" and "creatordate" fields
28803 git-pickaxe: rename detection optimization
28804 git-pickaxe: simplify Octopus merges further
28805 git-pickaxe: re-scan the blob after making progress with -M
28806 git-pickaxe: re-scan the blob after making progress with -C
28807 git-pickaxe: fix origin refcounting
28808 cherry is built-in, do not ship git-cherry.sh
28809 git-blame: add internal statistics to count read blobs.
28810 git-pickaxe: optimize by avoiding repeated read_sha1_file().
28811 Document git-pack-refs and link it to git(7).
28812 git-pickaxe: -L /regexp/,/regexp/
28813 git-pickaxe: allow "-L <something>,+N"
28816 Karl Hasselström (1):
28817 ignore-errors requires cl
28820 Make git-branch a builtin
28821 Fix show-ref usagestring
28823 Linus Torvalds (8):
28824 Add "git show-ref" builtin command
28825 Teach "git checkout" to use git-show-ref
28826 Start handling references internally as a sorted in-memory list
28827 Add support for negative refs
28828 Make ref resolution saner
28829 Enable the packed refs file format
28830 Allow '-' in config variable names
28831 git push: add verbose flag and allow overriding of default target repository
28834 gitweb: blame: print commit-8 on the leading row of a commit-block
28835 gitweb: blame: Mouse-over commit-8 shows author and date
28836 gitweb: blame porcelain: lineno and orig lineno swapped
28837 git-revert with conflicts to behave as git-merge with conflicts
28838 gitweb: esc_html() author in blame
28841 gitweb: start to generate PATH_INFO URLs.
28842 gitweb: warn if feature cannot be overridden.
28844 Matthew Wilcox (1):
28845 Add --dry-run option to git-send-email
28847 Nicolas Pitre (24):
28848 introduce delta objects with offset to base
28849 teach git-unpack-objects about deltas with offset to base
28850 teach git-index-pack about deltas with offset to base
28851 make git-pack-objects able to create deltas with offset to base
28852 make pack data reuse compatible with both delta types
28853 let the GIT native protocol use offsets to delta base when possible
28854 zap a debug remnant
28855 allow delta data reuse even if base object is a preferred base
28856 index-pack: compare only the first 20-bytes of the key.
28857 add the capability for index-pack to read from a stream
28858 enable index-pack streaming capability
28859 make index-pack able to complete thin packs.
28860 add progress status to index-pack
28861 mimic unpack-objects when --stdin is used with index-pack
28862 enhance clone and fetch -k experience
28863 index-pack: minor fixes to comment and function name
28864 missing small substitution
28865 make git-push a bit more verbose
28866 Allow pack header preprocessing before unpack-objects/index-pack.
28867 git-fetch can use both --thin and --keep with fetch-pack now
28868 improve fetch-pack's handling of kept packs
28869 have index-pack create .keep file more carefully
28870 remove .keep pack lock files when done with refs update
28871 git-pack-objects progress flag documentation and cleanup
28874 Fix broken sha1 locking
28875 Fix buggy ref recording
28876 gitweb: Document features better
28877 gitweb: Fix search form when PATH_INFO is enabled
28878 bisect reset: Leave the tree in usable state if git-checkout failed
28879 gitweb: Restore object-named links in item lists
28880 gitweb: Make search type a popup menu
28881 gitweb: Do not automatically append " git" to custom site name
28882 gitweb: Show project's README.html if available
28883 gitweb: Support for 'forks'
28884 gitweb: Fix up bogus $stylesheet declarations
28887 git-archive --format=zip: use default version ID
28888 git-archive --format=zip: add symlink support
28890 Make git-cherry handle root trees
28892 Robert Shearman (2):
28893 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
28894 git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
28896 Robin Rosenberg (2):
28897 Mention that pull can work locally in the synopsis
28898 Swap the porcelain and plumbing commands in the git man page
28901 Remove git-annotate.perl and create a builtin-alias for git-blame
28904 fetch: Misc output cleanup
28905 merge and resolve: Output short hashes and .. in "Updating ..."
28907 Sasha Khapyorsky (2):
28908 git-svnimport.perl: copying directory from original SVN place
28909 git-svnimport: support for partial imports
28911 Sean Estabrooks (1):
28912 Add --global option to git-repo-config.
28915 git-send-email: Document support for local sendmail instead of SMTP server
28916 git-send-email: Read the default SMTP server from the GIT config file
28918 Shawn O. Pearce (15):
28919 Use column indexes in git-cvsserver where necessary.
28920 Allow short pack names to git-pack-objects --unpacked=.
28921 Only repack active packs by skipping over kept packs.
28922 Teach git-index-pack how to keep a pack file.
28923 Remove unused variable in receive-pack.
28924 Move deny_non_fast_forwards handling completely into receive-pack.
28925 Teach receive-pack how to keep pack files based on object count.
28926 Added completion support for git-branch.exe.
28927 Added bash completion support for git-reset.
28928 Added missing completions for show-branch and merge-base.
28929 Only load .exe suffix'd completions on Cygwin.
28930 Bash completion support for remotes in .git/config.
28931 Take --git-dir into consideration during bash completion.
28932 Support bash completion on symmetric difference operator.
28933 Remove more sed invocations from within bash completion.
28936 Version v1.4.3.5; changes since v1.4.3.4:
28937 -----------------------------------------
28940 merge-recursive implicitely depends on trust_executable_bit
28943 git-svn: avoid printing filenames of files we're not tracking
28944 git-svn: don't die on rebuild when --upgrade is specified
28945 git-svn: fix dcommit losing changes when out-of-date from svn
28947 Jakub Narebski (1):
28948 Documentation: Transplanting branch with git-rebase --onto
28951 Fix git-runstatus for repositories containing a file named HEAD
28953 Junio C Hamano (3):
28954 adjust_shared_perm: chmod() only when needed.
28955 path-list: fix path-list-insert return value
28956 git-cvsserver: read from git with -z to get non-ASCII pathnames.
28959 Nicer error messages in case saving an object to db goes wrong
28961 Robert Shearman (1):
28962 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
28965 remove an unneeded test
28968 Version v1.4.3.4; changes since v1.4.3.3:
28969 -----------------------------------------
28972 Minor grammar fixes for git-diff-index.txt
28973 git-clone documentation didn't mention --origin as equivalent of -o
28975 Christian Couder (3):
28976 Remove --syslog in git-daemon inetd documentation examples.
28977 Documentation: add upload-archive service to git-daemon.
28978 Documentation: add git in /etc/services.
28981 Use memmove instead of memcpy for overlapping areas
28983 J. Bruce Fields (1):
28984 Documentation: updates to "Everyday GIT"
28986 Jakub Narebski (3):
28987 diff-format.txt: Combined diff format documentation supplement
28988 diff-format.txt: Correct information about pathnames quoting in patch format
28989 gitweb: Check git base URLs before generating URL from it
28992 Continue traversal when rev-list --unpacked finds a packed commit.
28994 Johannes Schindelin (1):
28995 link_temp_to_file: call adjust_shared_perm() only when we created the directory
28997 Junio C Hamano (9):
28998 Documentation: clarify refname disambiguation rules.
28999 combine-diff: a few more finishing touches.
29000 combine-diff: fix hunk_comment_line logic.
29001 combine-diff: honour --no-commit-id
29002 Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
29003 quote.c: ensure the same quoting across platforms.
29004 revision traversal: --unpacked does not limit commit list anymore.
29005 link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
29006 apply: handle "traditional" creation/deletion diff correctly.
29009 pack-objects doesn't create random pack names
29012 git-cherry: document limit and add diagram
29014 Shawn O. Pearce (3):
29015 Use ULONG_MAX rather than implicit cast of -1.
29016 Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
29017 Remove unsupported C99 style struct initializers in git-archive.
29020 Version v1.4.3.3; changes since v1.4.3.2:
29021 -----------------------------------------
29024 git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
29027 Set $HOME for selftests
29029 Junio C Hamano (5):
29030 Documentation: note about contrib/.
29031 RPM package re-classification.
29032 Refer to git-rev-parse:Specifying Revisions from git.txt
29033 Update cherry documentation.
29034 Documentation/SubmittingPatches: 3+1 != 6
29037 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
29040 git-fetch.sh printed protocol fix
29043 Version v1.4.3.2; changes since v1.4.3.1:
29044 -----------------------------------------
29046 Alexandre Julliard (1):
29047 prune-packed: Fix uninitialized variable.
29049 J. Bruce Fields (1):
29050 Make prune also run prune-packed
29052 Jakub Narebski (2):
29053 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
29054 gitweb: Do not esc_html $basedir argument to git_print_tree_entry
29057 git-clone: honor --quiet
29058 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
29060 Junio C Hamano (2):
29061 pager: default to LESS=FRSX not LESS=FRS
29062 daemon: do not die on older clients.
29064 Karl Hasselström (1):
29065 git-vc: better installation instructions
29068 Fix usagestring for git-branch
29071 gitweb: Fix setting $/ in parse_commit()
29074 git-merge: show usage if run without arguments
29077 Documentation for the [remote] config
29080 Version v1.4.3.1; changes since v1.4.3:
29081 ---------------------------------------
29083 Junio C Hamano (1):
29084 pager: default to LESS=FRS
29087 Fix typo in show-index.c
29089 Linus Torvalds (1):
29090 git-apply: prepare for upcoming GNU diff -u format change.
29092 Nguyễn Thái Ngọc Duy (2):
29093 Reject hexstring longer than 40-bytes in get_short_sha1()
29094 Add revspec documentation for ':path', ':[0-3]:path' and git-describe
29097 reduce delta head inflated size
29100 Version v1.4.3; changes since v1.4.3-rc3:
29101 -----------------------------------------
29103 Andy Whitcroft (1):
29104 add proper dependancies on the xdiff source
29106 Junio C Hamano (1):
29107 Revert "move pack creation to version 3"
29109 Linus Torvalds (1):
29110 Fix hash function in xdiff library
29113 git-imap-send: Strip smtp From_ header from imap message.
29116 svnimport: Fix broken tags being generated
29119 Make write_sha1_file_prepare() void
29120 Replace open-coded version of hash_sha1_file()
29123 Version v1.4.3-rc3; changes since v1.4.3-rc2:
29124 ---------------------------------------------
29126 Christian Couder (1):
29127 Fix tracing when GIT_TRACE is set to an empty string.
29130 git-svn: multi-init saves and reuses --tags and --branches arguments
29131 git-svn: log command fixes
29132 Documentation/git-svn: document some of the newer features
29133 git-svn: -h(elp) message formatting fixes
29134 commit: fix a segfault when displaying a commit with unreachable parents
29135 git-svn: add a message encouraging use of SVN::* libraries
29136 git-svn: fix commits over svn+ssh://
29137 git-svn: reduce memory usage for large commits
29139 Johannes Schindelin (3):
29140 diff: fix 2 whitespace issues
29141 cvsserver: Show correct letters for modified, removed and added files
29142 cvsserver: fix "cvs diff" in a subdirectory
29144 Junio C Hamano (6):
29145 Add WEBDAV timeout to http-fetch.
29146 git-fetch --update-head-ok typofix
29147 git-pull: we say commit X, not X commit.
29148 git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
29149 apply --numstat -z: line termination fix.
29150 t4015: work-around here document problem on Cygwin.
29153 paginate git-diff by default
29156 atomic write for sideband remote messages
29159 Documentation: add missing second colons and remove a typo
29160 Add hash_sha1_file()
29161 Make write_sha1_file_prepare() static
29164 clone: the given repository dir should be relative to $PWD
29167 Version v1.4.3-rc2; changes since v1.4.3-rc1:
29168 ---------------------------------------------
29171 Update the gitweb/README file to include setting the GITWEB_CONFIG environment
29172 Fix usage string to match that given in the man page
29174 Alexandre Julliard (2):
29175 git.el: Fixed inverted "renamed from/to" message.
29176 vc-git.el: Switch to using git-blame instead of git-annotate.
29178 Dennis Stosberg (2):
29179 lock_ref_sha1_basic does not remove empty directories on BSD
29180 Add default values for --window and --depth to the docs
29182 Franck Bui-Huu (1):
29183 Add git-upload-archive to the main git man page
29185 Jakub Narebski (1):
29186 gitweb: Cleanup Git logo and Git logo target generation
29188 Junio C Hamano (9):
29189 Makefile: install and clean merge-recur, still.
29190 git-mv: invalidate the removed path properly in cache-tree
29191 git-push: .git/remotes/ file does not require SP after colon
29192 escape tilde in Documentation/git-rev-parse.txt
29193 tar-tree deprecation: we eat our own dog food.
29194 gitweb: Make the Git logo link target to point to the homepage
29195 git-send-email: avoid uninitialized variable warning.
29196 cherry-pick: make -r the default
29200 gitweb: Escape ESCAPE (\e) character
29201 gitweb: Do not print "log" and "shortlog" redundantly in commit view
29202 gitweb: blame: Minimize vertical table row padding
29205 gitweb: document webserver configuration for common gitweb/repo URLs.
29206 git-commit: cleanup unused function.
29207 git-commit: fix coding style.
29208 test-lib: separate individual test better in verbose mode.
29211 add commit count options to git-shortlog
29214 Show snapshot link in shortlog only if have_snapsho
29215 gitweb: Separate (new) and (deleted) in commitdiff by a space
29216 gitweb: Handle commits with empty commit messages more reasonably
29217 gitweb: [commit view] Do not suppress commitdiff link in root commit
29220 git-tar-tree: don't RUN_SETUP
29222 Robin Rosenberg (1):
29223 Error in test description of t1200-tutorial
29226 gitweb: refactor decode() for utf8 conversion
29229 Version v1.4.3-rc1; changes since v1.4.2.4:
29230 -------------------------------------------
29233 Use const for interpolate arguments
29234 fix daemon.c compilation for NO_IPV6=1
29235 do not discard constness in interp_set_entry value argument
29237 Andy Whitcroft (3):
29238 send-pack: remove remote reference limit
29239 send-pack: switch to using git-rev-list --stdin
29240 svnimport: add support for parsing From: lines for author
29242 Aneesh Kumar K.V (4):
29243 gitweb: Support for snapshot
29244 gitweb: fix snapshot support
29245 gitweb: Make blame and snapshot a feature.
29246 gitweb: Fix git_blame
29249 Patch for http-fetch.c and older curl releases
29251 Christian Couder (8):
29252 Trace into open fd and refactor tracing code.
29253 Trace into a file or an open fd and refactor tracing code.
29254 Update GIT_TRACE documentation.
29255 Fix memory leak in prepend_to_path (git.c).
29256 Move add_to_string to "quote.c" and make it extern.
29257 Fix a memory leak in "connect.c" and die if command too long.
29258 Fix space in string " false" problem in "trace.c".
29259 Remove empty ref directories that prevent creating a ref.
29261 David Rientjes (18):
29262 blame.c return cleanup
29263 builtin-grep.c cleanup
29264 builtin-push.c cleanup
29266 http-push.c cleanup
29267 read-cache.c cleanup
29268 Make pprint_tag void and cleans up call in cmd_cat_file.
29269 Make show_entry void
29270 Make checkout_all void.
29271 Make fsck_dir void.
29272 Make pack_objects void.
29273 Make track_tree_refs void.
29274 Make upload_pack void and remove conditional return.
29275 Make sha1flush void and remove conditional return.
29276 make inline is_null_sha1 global
29277 use appropriate typedefs
29278 remove unnecessary initializations
29279 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
29281 Dennis Stosberg (10):
29282 "test" in Solaris' /bin/sh does not support -e
29283 Makefile fix for Solaris
29284 Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir
29285 Solaris has strlcpy() at least since version 8
29286 Look for sockaddr_storage in sys/socket.h
29287 Fix detection of ipv6 on Solaris
29288 Fix compilation with Sun CC
29289 gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
29290 gitweb: Remove forgotten call to git_to_hash
29291 use do() instead of require() to include configuration
29293 Dmitry V. Levin (3):
29294 Make count-objects, describe and merge-tree work in subdirectory
29295 Documentation: Fix broken links
29296 Handle invalid argc gently
29299 pass DESTDIR to the generated perl/Makefile
29300 git-svn: establish new connections on commit after fork
29301 git-svn: recommend rebase for syncing against an SVN repo
29302 git-svn: add the 'dcommit' command
29303 git-svn: stop repeatedly reusing the first commit message with dcommit
29305 Franck Bui-Huu (10):
29306 Add a newline before appending "Signed-off-by: " line
29307 log-tree.c: cleanup a bit append_signoff()
29309 git-archive: wire up TAR format.
29310 git-archive: wire up ZIP format.
29311 Add git-upload-archive
29312 connect.c: finish_connect(): allow null pid parameter
29313 Test return value of finish_connect()
29314 upload-archive: monitor child communication even more carefully.
29315 git-archive: update documentation
29317 Haavard Skinnemoen (1):
29318 git-send-email: Don't set author_not_sender from Cc: lines
29320 Jakub Narebski (138):
29321 gitweb: whitespace cleanup
29322 gitweb: Use list for of open for running git commands, thorougly.
29323 gitweb: simplify git_get_hash_by_path
29324 gitweb: More explicit error messages for open "-|"
29325 gitweb: Cleanup - chomp $line in consistent style
29326 gitweb: Cleanup - chomp @lines in consistent style
29327 gitweb: Add git_page_nav for later use
29328 gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
29329 gitweb: Replace form-feed character by ^L
29330 gitweb: Show project descriptions with utf-8 characters in project list correctly
29331 gitweb: Add "\n" after <br/> in git_page_nav
29332 gitweb: Pager refactoring - use git_get_paging_nav for pagination
29333 gitweb: Remove $project from git_get_paging_nav arguments
29334 gitweb: Headers refactoring - use git_header_div for header divs
29335 gitweb: Remove characters entities entirely when shortening string
29336 gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
29337 gitweb: Refactor generation of shortlog, tags and heads body
29338 gitweb: do not quote path for list version of open "-|"
29339 gitweb: Remove characters entities entirely when shortening string -- correction
29340 gitweb: Reordering code and dividing it into categories
29341 gitweb: Refactoring git_project_list
29342 autoconf: Add support for setting SHELL_PATH and PERL_PATH
29343 autoconf: Move site configuration section earlier in configure.ac
29344 autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
29345 autoconf: Check for ll hh j z t size specifiers introduced by C99
29346 autoconf: Typo cleanup, reordering etc.
29347 Copy description of new build configuration variables to configure.ac
29348 autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
29349 gitweb: Separate input validation and dispatch, add comment about opml action
29350 gitweb: die_error first (optional) parameter is HTTP status
29351 gitweb: Use undef for die_error to use default first (status) parameter value
29352 gitweb: Don't undefine query parameter related variables before die_error
29353 gitweb: Cleanup and uniquify error messages
29354 gitweb: No periods for error messages
29355 gitweb: No error messages with unescaped/unprotected user input
29356 gitweb: PATH_INFO=/ means no project
29357 gitweb: Inline $rss_link
29358 gitweb: Refactor untabifying - converting tabs to spaces
29359 gitweb: fix commitdiff for root commits
29360 gitweb: Skip nonmatching lines in difftree output, consistently
29361 autoconf: Unset NO_STH and NEED_STH when it is detected not needed
29362 gitweb: Remove unused variables in git_shortlog_body and git_heads
29363 autoconf: Add configure target to main Makefile
29364 autoconf: Error out on --without-shell and --without-perl
29365 autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
29366 autoconf: Move variables which we always set to config.mak.in
29367 autoconf: It is --without-python, not --no-python
29368 autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR
29369 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align
29370 gitweb: Great subroutines renaming
29371 gitweb: Separate ref parsing in git_get_refs_list into parse_ref
29372 gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
29373 gitweb: Separate main part of git_history into git_history_body
29374 gitweb: Separate finding project owner into git_get_project_owner
29375 gitweb: Change appereance of marker of refs pointing to given object
29376 gitweb: Skip comments in mime.types like file
29377 gitweb: True fix: Support for the standard mime.types map in gitweb
29378 gitweb: Separate printing difftree in git_commit into git_difftree_body
29379 gitweb: Show project's git URL on summary page
29380 gitweb: Add support for per project git URLs
29381 gitweb: Uniquify version info output, add meta generator in page header
29382 gitweb: Refactor printing commit message
29383 gitweb: Added parse_difftree_raw_line function for later use
29384 gitweb: Use parse_difftree_raw_line in git_difftree_body
29385 gitweb: bugfix: a.list formatting regression
29386 gitweb: Replace some presentational HTML by CSS
29387 gitweb: Whitespace cleanup: realign, reindent
29388 gitweb: Use underscore instead of hyphen to separate words in HTTP headers names
29389 gitweb: Route rest of action subroutines through %actions
29390 gitweb: Use here-doc
29391 gitweb: Drop the href() params which keys are not in %mapping
29392 gitweb: Sort CGI parameters returned by href()
29393 gitweb: Use git-diff-tree patch output for commitdiff
29394 gitweb: Show information about incomplete lines in commitdiff
29395 gitweb: Remove invalid comment in format_diff_line
29396 gitweb: Streamify patch output in git_commitdiff
29397 gitweb: Add git_get_{following,preceding}_references functions
29398 gitweb: Faster return from git_get_preceding_references if possible
29399 gitweb: Add git_get_rev_name_tags function
29400 gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
29401 gitweb: Add support for hash_parent_base parameter for blobdiffs
29402 gitweb: Allow for pre-parsed difftree info in git_patchset_body
29403 gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
29404 gitweb: Add invisible hyperlink to from-file/to-file diff header
29405 gitweb: Always display link to blobdiff_plain in git_blobdiff
29406 gitweb: Change here-doc back for style consistency in git_blobdiff
29407 gitweb: Use git-diff-tree or git-diff patch output for blobdiff
29408 gitweb: git_blobdiff_plain is git_blobdiff('plain')
29409 gitweb: Remove git_diff_print subroutine
29410 gitweb: Remove creating directory for temporary files
29411 gitweb: git_annotate didn't expect negative numeric timezone
29412 gitweb: Remove workaround for git-diff bug fixed in f82cd3c
29413 gitweb: Improve comments about gitweb features configuration
29414 gitweb: blobs defined by non-textual hash ids can be cached
29415 gitweb: Fix typo in git_difftree_body
29416 gitweb: Fix typo in git_patchset_body
29417 gitweb: Remove unused git_get_{preceding,following}_references
29418 gitweb: Remove git_to_hash function
29419 gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
29420 gitweb: Make git_print_log generic; git_print_simplified_log uses it
29421 gitweb: Do not remove signoff lines in git_print_simplified_log
29422 gitweb: Add author information to commitdiff view
29423 gitweb: git_print_log: signoff line is non-empty line
29424 gitweb: Add diff tree, with links to patches, to commitdiff view
29425 gitweb: Add local time and timezone to git_print_authorship
29426 gitweb: Move git-ls-tree output parsing to parse_ls_tree_line
29427 gitweb: Separate printing of git_tree row into git_print_tree_entry
29428 gitweb: Extend parse_difftree_raw_line to save commit info
29429 gitweb: Change the name of diff to parent link in "commit" view to "diff
29430 gitweb: Add GIT favicon, assuming image/png type
29431 gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
29432 gitweb: Divide page path into directories -- path's "breadcrumbs"
29433 autoconf: Add -liconv to LIBS when NEEDS_LIBICONV
29434 autoconf: Check for subprocess.py
29435 autoconf: Quote AC_CACHE_CHECK arguments
29436 autoconf: Fix copy'n'paste error
29437 autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
29438 autoconf: Add support for setting NO_ICONV and ICONVDIR
29439 autoconf: Add config.cache to .gitignore
29440 gitweb: Make pickaxe search a feature
29441 gitweb: Paginate history output
29442 gitweb: Use File::Find::find in git_get_projects_list
29443 gitweb: Do not parse refs by hand, use git-peek-remote instead
29444 gitweb: Add git_project_index for generating index.aux
29445 gitweb: Allow for href() to be used for links without project param
29446 gitweb: Add link to "project_index" view to "project_list" page
29447 gitweb: Fix mimetype_guess_file for files with multiple extensions
29448 gitweb: Even more support for PATH_INFO based URLs
29449 gitweb: Require project for almost all actions
29450 gitweb: Always use git-peek-remote in git_get_references
29451 gitweb: Make git_get_refs_list do work of git_get_references
29452 gitweb: Fix thinko in git_tags and git_heads
29453 gitweb: Make git_get_hash_by_path check type if provided
29454 gitweb: Strip trailing slashes from $path in git_get_hash_by_path
29455 gitweb: Use "return" instead of "return undef" for some subs
29456 gitweb: Split validate_input into validate_pathname and validate_refname
29457 gitweb: Add git_url subroutine, and use it to quote full URLs
29458 gitweb: Quote filename in HTTP Content-Disposition: header
29461 gitweb: optionally read config from GITWEB_CONFIG
29462 diff: support custom callbacks for output
29463 Move color option parsing out of diff.c and into color.[ch]
29464 git-commit.sh: convert run_status to a C builtin
29465 git-status: document colorization config options
29466 contrib/vim: add syntax highlighting file for commits
29467 wt-status: remove extraneous newline from 'deleted:' output
29468 rev-list: fix segfault with --{author,committer,grep}
29469 git-repack: allow git-repack to run in subdirectory
29471 Johannes Schindelin (35):
29472 Git.xs: older perl do not know const char *
29473 Status update on merge-recursive in C
29474 Cumulative update of merge-recursive in C
29475 merge-recur: Convert variable names to lower_case
29476 merge-recur: Get rid of debug code
29477 merge-recur: Remove dead code
29478 merge-recur: Fix compiler warning with -pedantic
29479 merge-recur: Cleanup last mixedCase variables...
29480 merge-recur: Explain why sha_eq() and struct stage_data cannot go
29481 merge-recur: fix thinko in unique_path()
29482 read-trees: refactor the unpack_trees() part
29483 read-tree: move merge functions to the library
29484 merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
29485 merge-recur: virtual commits shall never be parsed
29486 merge-recursive: fix rename handling
29487 http-push: avoid fork() by calling merge_bases() directly
29488 merge-recur: do not call git-write-tree
29489 merge-recur: do not setenv("GIT_INDEX_FILE")
29490 merge-recur: if there is no common ancestor, fake empty one
29491 merge-recur: try to merge older merge bases first
29492 merge-recur: do not die unnecessarily
29493 discard_cache(): discard index, even if no file was mmap()ed
29494 Add the --color-words option to the diff options family
29495 builtin-mv: readability patch
29496 unpack-objects: remove unused variable "eof"
29498 Remove uneeded #include
29499 fmt-merge-msg: fix off-by-one bug
29500 Teach runstatus about --untracked
29501 add receive.denyNonFastforwards config variable
29502 receive-pack: plug memory leak in fast-forward checking code.
29503 Document receive.denyNonFastforwards
29504 runstatus: do not recurse into subdirectories if not needed
29505 daemon: default to 256 for HOST_NAME_MAX if it is not defined
29506 diff --stat: ensure at least one '-' for deletions, and one '+' for additions
29509 Add virtualization support to git-daemon
29510 Cleaned up git-daemon virtual hosting support.
29511 Removed memory leaks from interpolation table uses.
29513 Jonas Fonseca (21):
29514 git-apply(1): document missing options and improve existing ones
29515 git-ls-remote(1): document --upload-pack
29516 git-blame(1): mention options in the synopsis and advertise pickaxe
29517 gitk(1): expand the manpage to look less like a template
29518 git(7): put the synopsis in a verse style paragraph
29519 gitview.txt: improve asciidoc markup
29520 git-svn(1): improve asciidoc markup
29521 describe: fix off-by-one error in --abbrev=40 handling
29522 Use PATH_MAX instead of MAXPATHLEN
29523 Use xrealloc instead of realloc
29524 Use fstat instead of fseek
29525 Use xcalloc instead of calloc
29526 Add --relative-date option to the revision interface
29527 git(7): move gitk(1) to the list of porcelain commands
29528 Use xmalloc instead of malloc
29529 Include config.mak.autogen in the doc Makefile
29530 git-rev-list(1): group options; reformat; document more options
29531 git-apply(1): document --unidiff-zero
29532 git-repack(1): document --window and --depth
29533 Fix trivial typos and inconsistencies in hooks documentation
29534 gitk(1): mention --all
29536 Junio C Hamano (125):
29537 Perl interface: add build-time configuration to allow building with -fPIC
29538 Perl interface: make testsuite work again.
29539 perl: fix make clean
29540 Git.pm: tentative fix to test the freshly built Git.pm
29541 Perly Git: arrange include path settings properly.
29542 Makefile: Set USE_PIC on x86-64
29543 Perly git: work around buggy make implementations.
29544 Git.pm: clean generated files.
29545 Perly Git: make sure we do test the freshly built one.
29546 INSTALL: a tip for running after building but without installing.
29547 Work around sed and make interactions on the backslash at the end of line.
29548 upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
29549 upload-pack: lift MAX_NEEDS and MAX_HAS limitation
29550 recur vs recursive: help testing without touching too many stuff.
29551 sha1_file.c: expose map_sha1_file() interface.
29552 pack-objects: reuse deflated data from new-style loose objects.
29553 unpack-objects: read configuration data upon startup.
29554 Makefile: git-merge-recur depends on xdiff libraries.
29555 gitweb: There can be more than two levels of subdirectories
29556 gitweb: an obvious cut and paste error.
29557 gitweb: fix use of uninitialized value.
29558 gitweb: when showing history of a tree, show tree link not blob
29559 gitweb: avoid undefined value warning in print_page_path
29560 gitweb/README: do not bug Kay with gitweb questions anymore
29561 Makefile: gitweb/gitweb.cgi is now generated.
29562 gitweb: do not use @@FOO@@ for replaced tokens
29563 .gitignore: git-merge-recur is a built file.
29564 Make git-checkout-index a builtin
29565 builtins: Makefile clean-up
29566 git.c: Rename NEEDS_PREFIX to RUN_SETUP
29567 autoconf: fix NEEDS_SSL_WITH_CRYPTO
29569 Racy git: avoid having to be always too careful
29570 read-cache: tweak racy-git delay logic
29571 autoconf: clean temporary file mak.append
29572 git-grep: show pathnames relative to the current directory
29573 upload-pack: minor clean-up in multi-ack logic
29574 Fix type of combine-diff.c::show_patch_diff()
29575 Remove combine-diff.c::uninteresting()
29576 t4116 apply --reverse test
29577 git-apply --reverse: simplify reverse option.
29578 git-apply --binary: clean up and prepare for --reverse
29580 Documentation/technical/racy-git.txt
29581 Add check program "git-check-racy"
29582 Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
29583 builtin-grep: remove unused debugging cruft.
29584 builtin-apply --reverse: two bugfixes.
29585 diff.c: make binary patch reversible.
29586 apply --reverse: tie it all together.
29588 git-apply --reject: send rejects to .rej files.
29589 git-apply --verbose
29590 apply --reject: count hunks starting from 1, not 0
29591 Convert memset(hash,0,20) to hashclr(hash).
29592 hashcpy/hashcmp remaining bits.
29593 builtin-grep.c: remove unused debugging piece.
29595 git-apply --reject: finishing touches.
29596 free(NULL) is perfectly valid.
29597 daemon: prepare for multiple services.
29598 daemon: add upload-tar service.
29599 multi-service daemon: documentation
29600 t5710: fix two thinkos.
29601 Constness tightening for move/link_temp_to_file()
29602 consolidate two copies of new style object header parsing code.
29603 pack-objects: re-validate data we copy from elsewhere.
29604 Revert "Convert git-annotate to use Git.pm"
29605 Revert "Git.pm: Introduce fast get_object() method"
29606 Revert "Make it possible to set up libgit directly (instead of from the environment)"
29607 pack-objects: fix thinko in revalidate code
29608 more lightweight revalidation while reusing deflated stream in packing
29609 unpack-objects desperately salvages objects from a corrupt pack
29610 revision.c: allow injecting revision parameters after setup_revisions().
29611 Teach rev-list an option to read revs from the standard input.
29612 Revert "daemon: add upload-tar service."
29613 Make apply --binary a no-op.
29614 diff --binary generates full index on binary files.
29615 Separate object listing routines out of rev-list
29616 pack-objects: run rev-list equivalent internally.
29617 pack-objects: further work on internal rev-list logic.
29618 pack-objects --unpacked=<existing pack> option.
29619 get_sha1_hex() micro-optimization
29620 archive: allow remote to have more formats than we understand.
29621 Move sideband client side support into reusable form.
29622 Move sideband server side support into reusable form.
29623 archive: force line buffered output to stderr
29624 Add --verbose to git-archive
29625 Teach --exec to git-archive --remote
29626 Prepare larger packet buffer for upload-pack protocol.
29627 Add sideband status report to git-archive protocol
29628 upload-archive: monitor child communication more carefully.
29629 builtin-archive.c: rename remote_request() to extract_remote_arg()
29630 pack-objects: document --revs, --unpacked and --all.
29631 http-fetch: fix alternates handling.
29632 unpack-objects -r: call it "recover".
29633 Document git-grep -[Hh]
29634 Define fallback PATH_MAX on systems that do not define one in <limits.h>
29635 Fix git-am safety checks
29636 http-fetch.c: consolidate code to detect missing fetch target
29637 Add ftp:// protocol support for git-http-fetch
29638 t1400: make test debuggable.
29639 apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
29640 builtin-grep: make pieces of it available as library.
29641 revision traversal: prepare for commit log match.
29642 revision traversal: --author, --committer, and --grep.
29643 repack: use only pack-objects, not rev-list.
29644 Update grep internal for grepping only in head/body
29645 git log: Unify header_filter and message_filter into one.
29646 Make hexval() available to others.
29647 sha1_name.c: understand "describe" output as a valid object name
29648 diff.c: second war on whitespace.
29649 git-apply: second war on whitespace.
29650 Add t5510 to test per branch configuration affecting git-fetch.
29651 Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
29652 Deprecate merge-recursive.py
29653 diff --stat: allow custom diffstat output width.
29654 diff --stat: color output.
29655 An illustration of rev-list --parents --pretty=raw
29656 grep: free expressions and patterns when done.
29657 grep: fix --fixed-strings combined with expression.
29658 Contributed bash completion support for core Git tools.
29659 git-diff -B output fix.
29660 Remove -fPIC which was only needed for Git.xs
29663 Linus Torvalds (10):
29664 Relative timestamps in git log
29665 git-fsck-objects: lacking default references should not be fatal
29666 Fix git-fsck-objects SIGSEGV/divide-by-zero
29667 Add "-h/-H" parsing to "git grep"
29668 Allow multiple "git_path()" uses
29669 git-log --author and --committer are not left-anchored by default
29670 Clean up approxidate() in preparation for fixes
29671 Fix approxidate() to understand more extended numbers
29672 diff --stat=width[,name-width]: allow custom diffstat output width.
29673 Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
29676 Fix duplicate xmalloc in builtin-add
29679 gitweb: git_tree displays blame based on repository config
29680 gitweb: bugfix: git_commit and git_commitdiff parents
29681 gitweb: blame table row no highlight fix
29682 gitweb: bugfix: commitdiff regression
29683 gitweb: bugfix: git_print_page_path() needs the hash base
29684 gitweb: tree view: eliminate redundant "blob"
29685 gitweb: Remove redundant "tree" link
29686 gitweb: extend blame to show links to diff and previous
29687 Revert "gitweb: extend blame to show links to diff and previous"
29688 gitweb: Remove excessively redundant entries from git_difftree_body
29689 gitweb: Add history and blame to git_difftree_body()
29690 gitweb: "alternate" starts with shade (i.e. 1)
29691 gitweb: Remove redundant "commit" link from shortlog
29692 gitweb: Factor out gitweb_have_snapshot()
29693 gitweb: Add snapshot to shortlog
29694 gitweb: Don't use quotemeta on internally generated strings
29695 gitweb: Remove redundant "commit" from history
29696 gitweb: History: blob and tree are first, then commitdiff, etc
29697 gitweb: tree view: hash_base and hash are now context sensitive
29699 Martin Langhoff (1):
29700 git-repack: create new packs inside $GIT_DIR, not cwd
29703 gitweb: fill in gitweb configuration by Makefile
29704 gitweb: use out-of-line GIT logo.
29705 gitweb: provide function to format the URL for an action link.
29706 gitweb: consolidate action URL generation.
29707 gitweb: continue consolidation of URL generation.
29708 gitweb: support for "fp" parameter.
29709 gitweb: support for / as home_link.
29710 gitweb: fix project list if PATH_INFO=="/".
29711 gitweb: more support for PATH_INFO based URLs
29712 gitweb: fix uninitialized variable warning.
29713 gitweb: fix display of trees via PATH_INFO.
29715 Matthias Kestenholz (6):
29716 Make git-name-rev a builtin
29717 Make git-pack-objects a builtin
29718 Make git-unpack-objects a builtin
29719 Make git-symbolic-ref a builtin
29720 Add gitweb.cgi to .gitignore
29721 Check if pack directory exists prior to descending into it
29723 Matthias Lederhofer (12):
29724 pager: environment variable GIT_PAGER to override PAGER
29725 gitweb: use a hash to lookup the sub for an action
29726 gitweb: require $ENV{'GITWEB_CONFIG'}
29727 gitweb: check if HTTP_ACCEPT is really set
29728 gitweb: fix commitdiff_plain for root commits
29729 gitweb: fix $project usage
29730 gitweb: do not use 'No such directory' error message
29731 gitweb: export options
29732 gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
29733 gitweb fix validating pg (page) parameter
29734 format-patch: use cwd as default output directory
29735 git-format-patch: fix bug using -o in subdirectories
29738 move pack creation to version 3
29739 many cleanups to sha1_file.c
29741 Paul Mackerras (10):
29742 gitk: Minor cleanups
29743 gitk: Recompute ancestor/descendent heads/tags when rereading refs
29744 gitk: Add a row context-menu item for creating a new branch
29745 gitk: Add a context menu for heads
29746 gitk: Fix a couple of buglets in the branch head menu items
29747 gitk: Add a menu item for cherry-picking commits
29748 gitk: Update preceding/following tag info when creating a tag
29749 gitk: Improve responsiveness while reading and layout out the graph
29750 gitk: Fix some bugs in the new cherry-picking code
29751 diff-index --cc shows a 3-way diff between HEAD, index and working tree.
29754 Fix probing for already installed Error.pm
29755 Delete manuals if compiling without docs
29756 Make perl interface a separate package
29759 Introduce Git.pm (v4)
29760 Git.pm: Implement Git::exec_path()
29761 Git.pm: Call external commands using execv_git_cmd()
29762 Git.pm: Implement Git::version()
29763 Add Error.pm to the distribution
29764 Git.pm: Better error handling
29765 Git.pm: Handle failed commands' output
29766 Git.pm: Enhance the command_pipe() mechanism
29767 Git.pm: Implement options for the command interface
29768 Git.pm: Add support for subdirectories inside of working copies
29769 Convert git-mv to use Git.pm
29770 Git.pm: assorted build related fixes.
29771 Git.pm: Try to support ActiveState output pipe
29772 Git.pm: Swap hash_object() parameters
29773 Git.pm: Fix Git->repository("/somewhere/totally/elsewhere")
29774 Git.pm: Support for perl/ being built by a different compiler
29775 Git.pm: Remove PerlIO usage from Git.xs
29776 Git.pm: Avoid ppport.h
29777 Git.pm: Don't #define around die
29778 Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
29779 Git.pm: Add config() method
29780 Convert git-send-email to use Git.pm
29781 Git.pm: Introduce ident() and ident_person() methods
29782 Make it possible to set up libgit directly (instead of from the environment)
29783 Git.pm: Introduce fast get_object() method
29784 Convert git-annotate to use Git.pm
29785 Eliminate Scalar::Util usage from private-Error.pm
29786 Fix showing of path in tree view
29787 gitweb: Link (HEAD) tree for each project from projects list
29788 gitweb: More per-view navigation bar links
29789 gitweb: Link to tree instead of snapshot in shortlog
29790 gitweb: Link to latest tree from the head line in heads list
29791 gitweb: Link to associated tree from a particular log item in full log view
29792 gitweb: Rename "plain" labels to "raw"
29793 gitweb: Relabel "head" as "HEAD"
29794 Make path in tree view look nicer
29795 gitweb: Fix tree link associated with each commit log entry.
29796 gitweb: Fix @git_base_url_list usage
29797 Fix snapshot link in tree view
29798 Git.pm: Kill Git.xs for now
29799 Deprecate git-resolve.sh
29800 gitweb: Consolidate escaping/validation of query string
29801 gitweb: fix over-eager application of esc_html().
29803 Pierre Habouzit (7):
29804 Fix a comparison bug in diff-delta.c
29805 avoid to use error that shadows the function name, use err instead.
29806 git_dir holds pointers to local strings, hence MUST be const.
29807 missing 'static' keywords
29808 remove ugly shadowing of loop indexes in subloops.
29809 use name[len] in switch directly, instead of creating a shadowed variable.
29810 n is in fact unused, and is later shadowed.
29812 Randal L. Schwartz (1):
29813 builtin-upload-archive.c broken on openbsd
29816 git-verify-pack: make builtin
29818 Add write_or_die(), a helper function
29820 git-cherry: remove unused variable
29821 git-reset: remove unused variable
29822 Add git-zip-tree to .gitignore
29823 git-archive: make compression level of ZIP archives configurable
29824 Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
29825 git-archive: inline default_parse_extra()
29826 git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
29827 Remove git-zip-tree
29828 Rename builtin-zip-tree.c to archive-zip.c
29829 git-tar-tree: Remove duplicate git_config() call
29830 git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
29832 Robin Rosenberg (2):
29833 Quote arguments to tr in test-lib
29834 Make cvsexportcommit remove files.
29837 Fetch: default remote repository from branch properties
29838 fetch: get the remote branches to merge from the branch properties
29839 Add test for the default merges in fetch.
29840 fetch: Reset remote refs list each time fetch_main is called
29842 Sasha Khapyorsky (3):
29843 Trivial support for cloning and fetching via ftp://.
29844 git-svnimport: Parse log message for Signed-off-by: lines
29845 http/ftp: optionally ask curl to not use EPSV command
29848 Documentation: Fix howto/revert-branch-rebase.html generation
29849 git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
29851 Shawn O. Pearce (15):
29852 Verify we know how to read a pack before trying to using it.
29853 Remove unnecessary forward declaration of unpack_entry.
29854 Convert memcpy(a,b,20) to hashcpy(a,b).
29855 Convert memcpy(a,b,20) to hashcpy(a,b).
29856 Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
29857 Reuse compression code in unpack_compressed_entry.
29858 Cleanup unpack_entry_gently and friends to use type_name array.
29859 Cleanup unpack_object_header to use only offsets.
29860 Convert unpack_entry_gently and friends to use offsets.
29861 Replace uses of strdup with xstrdup.
29862 Allow 'svn fetch' on '(no date)' revisions in Subversion.
29863 Allow '(no author)' in git-svn's authors file.
29864 Ignore executable bit when adding files if filemode=0.
29865 Allow git-checkout when on a non-existant branch.
29866 Corrected copy-and-paste thinko in ignore executable bit test case.
29868 Tilman Sauerbeck (2):
29870 Added support for dropping privileges to git-daemon.
29873 --name-only, --name-status, --check and -s are mutually exclusive
29874 Remove awkward compatibility warts
29877 Be nicer if git executable is not installed
29880 gitweb: configurable home link string
29881 gitweb: Decode long title for link tooltips
29884 Version v1.4.2.4; changes since v1.4.2.3:
29885 -----------------------------------------
29887 Linus Torvalds (1):
29888 Fix hash function in xdiff library
29891 Version v1.4.2.3; changes since v1.4.2.2:
29892 -----------------------------------------
29894 Junio C Hamano (2):
29895 git-mv: invalidate the removed path properly in cache-tree
29896 git-push: .git/remotes/ file does not require SP after colon
29899 Version v1.4.2.2; changes since v1.4.2.1:
29900 -----------------------------------------
29902 Junio C Hamano (2):
29903 Fix git-am safety checks
29904 git-diff -B output fix.
29907 Fix duplicate xmalloc in builtin-add
29910 Version v1.4.2.1; changes since v1.4.2:
29911 ---------------------------------------
29913 Dennis Stosberg (1):
29914 Solaris does not support C99 format strings before version 10
29916 Johannes Schindelin (5):
29917 git-mv: succeed even if source is a prefix of destination
29918 git-mv: add more path normalization
29919 git-mv: special case destination "."
29920 git-mv: fix off-by-one error
29921 builtin-mv: readability patch
29923 Junio C Hamano (2):
29924 finish_connect(): thinkofix
29925 http-fetch: fix alternates handling.
29928 Fix regex pattern in commit-msg
29929 sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
29932 Version v1.4.2; changes since v1.4.2-rc4:
29933 -----------------------------------------
29936 git-svn: correctly kill keyword expansion without munging EOLs
29937 git-svn: bugfix: allow SVN:: lib users to track the root of the repository
29938 git-svn: split the path from the url correctly with limited perms
29940 Junio C Hamano (8):
29941 git-apply: applying a patch to make a symlink shorter.
29942 combine-diff: use color
29944 builtin-apply: remove unused increment
29945 git-sh-setup: do not use repo-config to test the git directory
29946 git-am: give better diagnostics when the patch does not apply during --3way
29947 Better error message when we are unable to lock the index file
29948 t/t4013: fix futzing with the version string.
29950 Matthias Lederhofer (1):
29951 upload-pack: fix timeout in create_pack_file
29953 Paul Mackerras (2):
29954 gitk: Allow the user to set some colors
29955 gitk: Show the currently checked-out head in bold font
29957 Ramsay Allan Jones (1):
29958 Fix header breakage with _XOPEN_SOURCE.
29961 Add has_extension()
29962 git-verify-pack: show usage when no pack was specified
29963 git-verify-pack: more careful path handling
29964 git-verify-pack: insist on .idx extension
29965 git-verify-pack: get rid of while loop
29966 git-verify-pack: free pack after use and a cleanup
29967 git-verify-pack: buffer overrun paranoia
29968 git-verify-pack: no need to count errors
29969 drop length argument of has_extension
29971 Rutger Nijlunsing (2):
29972 http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
29973 Add Documentation/howto/setup-git-server-over-http.txt
29976 Version v1.4.2-rc4; changes since v1.4.2-rc3:
29977 ---------------------------------------------
29980 git-push: allow pushing from subdirectories
29982 Johannes Schindelin (1):
29983 Fix crash when GIT_DIR is invalid
29986 Update git-init-db(1) and documentation of core.sharedRepository
29988 Junio C Hamano (13):
29989 Cygwin needs NO_C99_FORMAT???
29990 Further clean-up: usage() vs die()
29991 Makefile: Cygwin does not seem to need NO_STRLCPY
29993 debugging: XMALLOC_POISON
29994 builtin-mv: fix use of uninitialized memory.
29995 GIT-VERSION-GEN: adjust for ancient git
29996 Documentation: git-status takes the same options as git-commit
29997 Fix tutorial-2.html
29998 check return value from diff_setup_done()
29999 find_unique_abbrev() with len=0 should not abbreviate
30000 make --find-copies-harder imply -C
30001 allow diff.renamelimit to be set regardless of -M/-C
30003 Michael Krelin (1):
30004 handle https:// protocol in git-clone
30006 Ramsay Allan Jones (4):
30007 Fixup command names in some usage strings.
30008 Replace some calls to die(usage_str) with usage(usage_str).
30009 Allow config file to specify Signed-off-by identity in format-patch.
30010 commit walkers: setup_ident() to record correct committer in ref-log.
30013 git-tar-tree: fix minor memory leak
30016 log-tree: show_log() should respect the setting of diffopt->line_termination
30017 annotate: Fix bug when parsing merges with differing real and logical parents.
30019 Uwe Kleine-König (1):
30020 Document rev-list's option --merge
30023 Version v1.4.2-rc3; changes since v1.4.2-rc2:
30024 ---------------------------------------------
30027 Build on Debian GNU/kFreeBSD
30029 Jakub Narebski (11):
30030 Allow INSTALL, bindir, mandir to be set in main Makefile
30031 Rename man1 and man7 variables to man1dir and man7dir
30032 autoconf: Use autoconf to write installation directories to config.mak.autogen
30033 Teach make clean about configure and autoconf
30034 Copy description of build configuration variables to configure.ac
30035 autoconf: Preparing the way for autodetection
30036 autoconf: Checks for typedefs, structures, and compiler characteristics.
30037 autoconf: Checks for some library functions.
30038 autoconf: Checks for libraries
30039 autoconf: Checks for some programs
30040 configure.ac vertical whitespace usage cleanup
30043 git-push: allow -f as an alias for --force
30044 git-push: remove obsolete git-push.sh
30045 Documentation: convert uses of git-link macro to gitlink
30046 git-annotate: remove extraneous debugging line
30048 Johannes Schindelin (16):
30049 Allow an alias to start with "-p"
30050 git wrapper: add --git-dir=<path> and --bare options
30051 git-instaweb: some Apache have mod_cgi builtin
30052 git-instaweb: respect bindir from Makefile
30053 gitweb: fix two warnings
30054 t7001: add test for git-mv dir1 dir2/
30055 git-cvsserver: support multiline commit messages
30056 Extract helper bits from c-merge-recursive work
30057 Make git-mv a builtin
30058 builtin git-mv: support moving directories
30059 instaweb: Be more clear if httpd or the browser fail
30060 cvsserver: imitate git-update-ref when committing
30061 Makefile: ssh-pull.o depends on ssh-fetch.c
30062 Teach git-apply about '-R'
30064 tar-tree: illustrate an obscure feature better
30066 Josef Weidendorfer (1):
30067 Extend testing git-mv for renaming of subdirectories
30069 Junio C Hamano (18):
30070 git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
30071 t4112: simplify the test and remove unneeded working tree file.
30072 lost-found: use fsck-objects --full
30073 git-reset: detect update-ref error and report it.
30074 log and diff family: honor config even from subdirectories
30075 git-apply -R: binary patches are irreversible for now.
30076 t4103: fix binary patch application test.
30077 git-checkout: allow "checkout HEAD -- path"
30078 Builtins: control the use of pager from the command table.
30079 fetch/clone: mark messages from remote side stand out.
30080 Fix "git diff blob1 blob2" showing the diff in reverse.
30081 read-tree: shadowed variable fix.
30082 Add a couple of subdirectory tests.
30083 diff.c: do not use pathname comparison to tell renames
30084 Show both blob names from "git diff blob1 blob2"
30085 sideband: do not use color, just say "remote:"
30086 Documentation/git.txt: link git-svn and git-instaweb from the main page.
30089 Linus Torvalds (4):
30090 Call setup_git_directory() early
30091 Call setup_git_directory() much earlier
30092 Fix double "close()" in ce_compare_data
30093 Fix up some fallout from "setup_git_directory()" cleanups
30096 gitweb.cgi: Teach git_history() to read hash from $hash_base
30097 gitweb.cgi: Include direct link to "raw" files from "history"
30098 gitweb.cgi: git_blame2: an alternative simple working git blame
30099 gitweb.cgi: git_blame2: Allow back-trekking through commits
30100 gitweb.cgi: Show "raw" head of project link even when $hash is not defined
30101 gitweb.cgi: git_blame2: Revision blocks now have alternating colors
30102 gitweb.cgi: Centralize printing of the page path
30103 gitweb.cgi: git_blame2: slight optimization reading the blame lines
30105 Matthias Kestenholz (3):
30106 Make git-prune-packed a builtin
30107 Make git-repo-config a builtin
30108 use declarations from builtin.h for builtin commands
30110 Matthias Lederhofer (5):
30111 daemon: documentation for --reuseaddr, --detach and --pid-file
30112 setup_git_directory_gently: do not barf when GIT_DIR is given.
30113 git.c: allow alias expansion without a git directory
30114 pager: config variable pager.color
30115 git-grep: document --and, --or, --not, ( and )
30117 Michael S. Tsirkin (1):
30118 mailinfo: accept >From in message header
30120 Michele Ballabio (1):
30121 fixed variable declaration in gitk
30124 Typofix in configure.ac comment.
30125 Quote all calls to GIT_CONF_APPEND_LINE
30126 Set datarootdir in config.mak.in
30129 Remove -d from *-fetch usage strings
30130 Make pull() take some implicit data as explicit arguments
30131 Make pull() support fetching multiple targets at once
30132 Teach git-local-fetch the --stdin switch
30133 Teach git-http-fetch the --stdin switch
30135 Ramsay Allan Jones (7):
30136 Ensure git-clone exits with error if perl script fails.
30137 Fix annotate test script; notice when git-annotate fails.
30138 Fix installation of templates on ancient systems.
30139 New tests and en-passant modifications to mktag.
30140 Add NO_C99_FORMAT to support older compilers.
30141 Fix header breakage due to redefining PATH_MAX.
30142 Remove cmd_usage() routine and re-organize the help/usage code.
30144 Robert Shearman (2):
30145 rebase: Fix the detection of fast-forwarding of the current branch to upstream.
30146 rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
30148 Shawn O. Pearce (1):
30149 Display an error from update-ref if target ref name is invalid.
30152 Version v1.4.2-rc2; changes since v1.4.2-rc1:
30153 ---------------------------------------------
30156 Trivial path optimization test
30158 Alexandre Julliard (5):
30159 git.el: Run git-rerere on commits if the rr-cache directory exists.
30160 git.el: Prepend a slash to the file name when adding to .gitignore.
30161 git.el: Try to reuse an existing buffer when running git-status.
30162 git.el: Put the git customize group in the 'tools' parent group.
30163 show-branch: Fix another performance problem.
30166 gitweb: escape tag comments
30169 typechange tests for git apply (currently failing)
30170 git-svn: fix fetching new directories copies when using SVN:: libs
30173 pack-objects: check pack.window for default window size
30174 Colorize 'commit' lines in log ui
30176 Johannes Schindelin (4):
30177 Fix t4114 on cygwin
30178 Always reset the color _before_ printing out the newline
30179 cvsserver: suppress warnings
30180 cvsserver: avoid warning about active db handles
30183 git-format-patch: Make the second and subsequent mails replies to the first
30184 Add option to enable threading headers
30185 Add option to set initial In-Reply-To/References
30187 Junio C Hamano (8):
30188 fetch/clone: check return status from ls-remote
30189 builtin-log: typefix for recent format-patch changes.
30190 checkout -f failed to check out a file if an existing directory interfered.
30191 apply: check D/F conflicts more carefully.
30192 apply: split out removal and creation into different phases.
30193 apply: handle type-changing patch correctly.
30194 git-fetch: fix --keep vs --thin
30195 unpack-objects: remove stale and confusing comment
30197 Linus Torvalds (1):
30198 sha1_file: add the ability to parse objects in "pack file format"
30200 Lukas Sandström (1):
30201 git-am: Don't accept an mbox on stdin of we already have a .dotest directory
30203 Martin Langhoff (1):
30204 cvsexportcommit - add -a (add author line) flag, cleanup warnings
30206 Matthias Lederhofer (1):
30207 upload-pack: fix timeout in create_pack_file
30210 Substitute xmalloc()+memset(0) with xcalloc().
30213 Defaulting fetch to origin when set in the repo-config
30215 Shawn O. Pearce (1):
30216 Disable linking with Fink or DarwinPorts.
30219 tar-tree: add the "tar.umask" config option
30222 Version v1.4.2-rc1; changes since v1.4.1.1:
30223 -------------------------------------------
30225 A Large Angry SCM (1):
30226 Additional merge-base tests (revised)
30229 Do not use perl in git-commit.sh
30232 Fix some doubled word typos
30233 Fix some doubled word typos
30234 Fix typos involving the word 'commit'
30235 typofix (git-name-rev documentation)
30236 git-send-email: Remove redundant Reply-To header
30237 gitweb: Send XHTML as 'application/xhtml+xml' where possible
30238 gitweb: Include a site name in page titles
30239 gitweb: Make command invocations go through the git wrapper
30240 documentation (urls.txt) typofix
30242 Dennis Stosberg (2):
30243 gitweb: Declare global variables with "our"
30244 gitweb: Declare global variables with "our"
30247 Add git-instaweb, instantly browse the working repo with gitweb
30248 instaweb: fix unportable ';' usage in sed
30249 t8001-annotate: fix a bash-ism in this test
30250 git-svn: avoid fetching files outside of the URL we're tracking
30251 git-svn: migrate out of contrib
30252 builtin-log: respect diff configuration options
30253 diff.c: respect diff.renames config option
30254 templates/hooks--update: replace diffstat calls with git diff --stat
30255 git-svn: fix --file/-F option in commit-diff
30256 tests: Set EDITOR=: and VISUAL=: globally
30257 git-fetch: fix a bashism (==)
30258 git-svn: don't check for migrations/upgrades on commit-diff
30260 Jakub Narebski (3):
30261 send-email: format 2822 datestring ourselves.
30262 Wrap long lines in docstrings in contrib/emacs/git.el
30263 Display help for Git mode after pressing `h' or `?' in *git-status*
30265 Joachim Berdal Haga (2):
30266 Make zlib compression level configurable, and change default.
30267 core.compression documentation formatting fix.
30269 Johannes Schindelin (7):
30270 refactor merge_bases() as preparation to libify merge-base
30271 move get_merge_bases() to core lib.
30272 Makefile: replace ugly and unportable sed invocation
30273 Make git-fmt-merge-msg a builtin
30274 Makefile: export NO_SVN_TESTS
30275 Close the index file between writing and committing
30276 Fix linking for not-so-clever linkers.
30279 Documentation/urls.txt: Use substitution to escape square brackets
30281 Junio C Hamano (49):
30282 Makefile: add framework to verify and bench sha1 implementations.
30283 test-sha1: test hashing large buffer
30284 t4013: add tests for diff/log family output options.
30285 t4013: add more tests around -c and --cc
30286 Fix some more diff options changes.
30287 t4013 test updates for new output code.
30288 combine-diff.c: type sanity.
30289 format-patch: fix diff format option implementation
30290 t4013: add format-patch tests.
30291 t4013: note improvements brought by the new output code.
30292 gitweb: optimize per-file history generation
30293 gitweb: optimize per-file history generation
30294 t4013: add "diff" UI program tests.
30295 builtin-diff: turn recursive on when defaulting to --patch format.
30296 commit.c: do not redefine UNINTERESTING bit.
30297 get_merge_bases: clean up even when there is no common commit.
30298 revert clear-commit-marks for now.
30299 boolean: accept yes and no as well
30300 send-email: do not barf when Term::ReadLine does not like your terminal
30301 t6200: fmt-merge-msg test.
30302 git-grep: fix parsing of pathspec separator '--'
30303 git-grep: fix exit code when we use external grep.
30304 git-grep: use a bit more specific error messages.
30305 Re-fix clear_commit_marks().
30306 git-grep: boolean expression on pattern matching.
30307 git-reset: complain and exit upon seeing an unknown parameter.
30308 mailinfo: assume input is latin-1 on the header as we do for the body
30309 diffcore-rename: try matching up renames without populating filespec first.
30310 builtin-rev-parse.c: constness tightening
30311 show-branch: match documentation and usage
30312 rev-parse documentation: talk about range notation.
30313 git-svn: migrate out of contrib (follow-up)
30314 diff.c: --no-color to defeat diff.color configuration.
30315 Update diff-options and config documentation.
30316 git log -p --merge [[--] paths...]
30317 colored diff: diff.color = auto fix
30318 diff: do not use configuration magic at the core-level
30319 "git -p cmd" to page anywhere
30320 merge-base: update the clean-up postprocessing
30322 Fix grammatical error in git-revert
30323 git-repack: avoid redirecting stderr into git-pack-objects
30324 test-lib: unset GIT_TRACE
30325 t4013 diff format tests update
30326 Adjust t4013 tests to corrected format-patch.
30327 Documentation: Fix ssh://[user@]host.xz URL
30328 builtin-prune.c: forgot TYPE => OBJ changes.
30329 Documentation/Makefile: product depends on asciidoc.conf
30330 show-branch: fix performance problem.
30332 Linus Torvalds (7):
30333 xdiff: generate "anti-diffs" aka what is common to two files
30334 Prepare "git-merge-tree" for future work
30335 Improved three-way blob merging code
30336 Improve git-peek-remote
30337 builtin "git prune"
30338 Make the unpacked object header functions static to sha1_file.c
30339 Remove TYPE_* constant macros and use object_type enums consistently.
30342 gitweb: Enable tree (directory) history display
30343 gitweb: Enable tree (directory) history display
30344 Add "raw" output option to blobs in "tree" view format
30345 gitweb.cgi: Create $git_temp if it doesn't exist
30346 gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
30347 gitweb.css: Use monospace fonts for commits and tree-diff.
30349 Matthias Lederhofer (10):
30350 GIT_TRACE: show which built-in/external commands are executed
30351 change ent to tree in git-diff documentation
30352 git-rev-list: add documentation for --parents, --no-merges
30353 daemon: use a custom die routine with syslog
30354 daemon: if one of the standard fds is missing open it to /dev/null
30355 upload-pack: ignore write errors to stderr
30356 daemon: new option --pid-file=<path> to store the pid
30357 daemon: new option --detach to run git-daemon in background
30358 Documentation about exclude/ignore files
30359 argv created by handle_alias should be NULL terminated
30362 sed -e '/RE/r rfile/' needs space in 'r rfile'
30363 Using 'perl' in *.sh
30366 Assorted typo fixes
30367 Typofix in Makefile comment.
30368 Fix more typos, primarily in the code
30369 Avoid C99 comments, use old-style C comments instead.
30372 git-cvsexportcommit can't handle merge commits correctly
30375 Add get_merge_bases_clean()
30376 Add '...' operator for revisions
30377 Make clear_commit_marks() clean harder
30378 Fold get_merge_bases_clean() into get_merge_bases()
30379 rev-list: free commit_list in ... handler
30381 Robert Shearman (1):
30382 format-patch: Generate a newline between the subject header and the message body
30385 annotate: Support annotation of files on other revisions.
30386 annotate: Correct most merge following to annotate correctly.
30387 Disable color detection during format-patch
30390 Teach rev-parse the ... syntax.
30393 Fix "git-fetch --tags" exit status when nothing has been changed
30395 Shawn O. Pearce (9):
30396 Avoid C99 initializers
30397 Allow user.name and user.email to drive reflog entry.
30398 Record the type of commit operation in the reflog.
30399 Log ref changes made by git-fetch and git-pull.
30400 Log ref changes made by git-merge and git-pull.
30401 Log ref changes made by quiltimport.
30402 Log ref changes made by resolve.
30403 Make lazy mkdir more robust.
30404 Record rebase changes as 'rebase' in the reflog.
30407 Do not drop data from '\0' until eol in patch output
30408 Teach --text option to diff
30409 Teach diff -a as shorthand for --text
30410 Add -a and --text to common diff options help
30411 diff-options: Explain --text and -a
30413 Timo Hirvonen (14):
30414 Merge with_raw, with_stat and summary variables to output_format
30415 Make --raw option available for all diff commands
30416 Set default diff output format after parsing command line
30417 DIFF_FORMAT_RAW is not default anymore
30418 Add msg_sep to diff_options
30419 Don't xcalloc() struct diffstat_t
30420 whatchanged: Default to DIFF_FORMAT_RAW
30421 Print empty line between raw, stat, summary and patch
30422 diff-tree: Use ---\n as a message separator
30423 log --raw: Don't descend into subdirectories by default
30425 GIT_TRACE: fix a mixed declarations and code warning
30426 diff: Support both attributes and colors
30427 diff: Support 256 colors
30430 Fix print-log and diff compatibility with recent vc versions
30433 Mention the [user@] part in documentation of ssh:// urls.
30436 A better-scheduled PPC SHA-1 implementation.
30439 Version v1.4.1.1; changes since v1.4.1:
30440 ---------------------------------------
30442 Junio C Hamano (1):
30443 Makefile: tighten git-http-{fetch,push} dependencies
30445 Linus Torvalds (1):
30446 revision.c: fix "dense" under --remove-empty
30448 Matthias Lederhofer (1):
30449 upload-pack: fix timeout in create_pack_file
30451 Robin Rosenberg (1):
30452 Empty author may be presented by svn as an empty string or a null value.
30455 Version v1.4.1; changes since v1.4.1-rc2:
30456 -----------------------------------------
30459 git-svn: allow a local target directory to be specified for init
30461 Johannes Schindelin (4):
30462 add diff_flush_patch_id() to calculate the patch id
30463 format-patch: introduce "--ignore-if-in-upstream"
30464 t4014: fix for whitespace from "wc -l"
30465 format-patch: use clear_commit_marks() instead of some ad-hockery
30467 Junio C Hamano (6):
30468 git-repack: Be careful when updating the same pack as an existing one.
30469 t4014: add format-patch --ignore-if-in-upstream test
30470 t4014: fix test commit labels.
30471 diff.c: fix get_patch_id()
30473 upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
30475 Linus Torvalds (4):
30476 Do not try futile object pairs when repacking.
30477 Abstract out accesses to object hash array
30478 revision.c: --full-history fix.
30479 git object hash cleanups
30482 consider previous pack undeltified object state only when reusing delta data
30483 don't load objects needlessly when repacking
30486 Fix errno usage in connect.c
30488 Robin Rosenberg (1):
30489 Minor documentation fixup.
30492 Version v1.4.1-rc2; changes since v1.4.1-rc1:
30493 ---------------------------------------------
30495 Andreas Ericsson (1):
30496 git wrapper: fix command name in an error message.
30498 Dennis Stosberg (3):
30499 Solaris needs inclusion of signal.h for signal()
30500 Fix pkt-line.h to compile with a non-GCC compiler
30501 Fix expr usage for FreeBSD
30504 rebase: allow --merge option to handle patches merged upstream
30505 rebase: cleanup rebasing with --merge
30506 rebase: allow --skip to work with --merge
30507 git-svn: SVN 1.1.x library compatibility
30508 git-svn: several graft-branches improvements
30509 git-svn: add the commit-diff command
30510 git-svn: add --follow-parent and --no-metadata options to fetch
30511 git-svn: be verbose by default on fetch/commit, add -q/--quiet option
30512 rebase: get rid of outdated MRESOLVEMSG
30513 rebase: check for errors from git-commit
30516 git-commit: allow -e option anywhere on command line
30517 quote.c: silence compiler warnings from EMIT macro
30519 Johannes Schindelin (5):
30520 patch-id: take "commit" prefix as well as "diff-tree" prefix
30521 Teach diff about -b and -w flags
30522 cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
30523 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
30524 Save errno in handle_alias()
30526 Junio C Hamano (12):
30527 Makefile: do not recompile main programs when libraries have changed.
30528 usage: minimum type fix.
30529 git-pull: abort when fmt-merge-msg fails.
30531 diff --color: use reset sequence when we mean reset.
30532 repo-config: fix printing of bool
30533 diff --color: use $GIT_DIR/config
30534 combine-diff.c: type sanity
30535 connect.c: remove unused parameters from tcp_connect and proxy_connect
30536 connect.c: check the commit buffer boundary while parsing.
30537 t/README: start testing porcelainish
30538 checkout -m: fix read-tree invocation
30540 Linus Torvalds (1):
30543 Martin Langhoff (3):
30544 git-repack -- respect -q and be quiet
30545 cvsimport: setup indexes correctly for ancestors and incremental imports
30546 cvsimport - cleanup of the multi-indexes handling
30548 Matthias Kestenholz (1):
30549 add GIT-CFLAGS to .gitignore
30551 Matthias Lederhofer (1):
30552 correct documentation for git grep
30555 Rename safe_strncpy() to strlcpy().
30558 Customizable error handlers
30561 git-merge: Don't use -p when outputting summary
30563 Make some strings const
30566 git-commit: filter out log message lines only when editor was run.
30569 Version v1.4.1-rc1; changes since v1.4.0:
30570 -----------------------------------------
30573 object-refs: avoid division by zero
30575 David Woodhouse (1):
30576 Log peer address when git-daemon called from inetd
30578 Dennis Stosberg (3):
30579 Make t4101-apply-nonl bring along its patches
30580 Make t8001-annotate and t8002-blame more portable
30581 Fix t8001-annotate and t8002-blame for ActiveState Perl
30583 Eric W. Biederman (3):
30584 Don't parse any headers in the real body of an email message.
30585 Fix git-format-patch -s
30586 Check and document the options to prevent mistakes.
30589 git-svn: t0000: add -f flag to checkout
30590 git-svn: fix handling of filenames with embedded '@'
30591 git-svn: eol_cp corner-case fixes
30592 git-svn: restore original LC_ALL setting (or unset) for commit
30593 git-svn: don't allow commit if svn tree is not current
30594 git-svn: support -C<num> passing to git-diff-tree
30595 git-svn: --branch-all-refs / -B support
30596 git-svn: optimize --branch and --branch-all-ref
30597 git-svn: support manually placed initial trees from fetch
30598 git-svn: Move all git-svn-related paths into $GIT_DIR/svn
30599 git-svn: minor cleanups, extra error-checking
30600 git-svn: add --repack and --repack-flags= options
30601 git-svn: add --shared and --template= options to pass to init-db
30602 git-svn: add some functionality to better support branches in svn
30603 git-svn: add UTF-8 message test
30604 git-svn: add 'log' command, a facsimile of basic `svn log'
30605 git-svn: add support for Perl SVN::* libraries
30606 git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
30607 git-svn: avoid creating some small files
30608 git-svn: fix several small bugs, enable branch optimization
30609 git-svn: Eliminate temp file usage in libsvn_get_file()
30610 git-svn: bugfix and optimize the 'log' command
30611 git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
30612 git-svn: svn (command-line) 1.0.x compatibility
30613 git-svn: rebuild convenience and bugfixes
30614 git-svn: fix --rmdir when using SVN:: libraries
30615 rebase: Allow merge strategies to be used when rebasing
30616 rebase: error out for NO_PYTHON if they use recursive merge
30617 git-svn: fix commit --edit flag when using SVN:: libraries
30619 Florian Forster (9):
30620 gitweb: Adding a `blame' interface.
30621 gitweb: Make the `blame' interface in gitweb optional.
30622 Remove ranges from switch statements.
30623 Initialize FAMs using `FLEX_ARRAY'.
30624 Don't instantiate structures with FAMs.
30625 Cast pointers to `void *' when used in a format.
30626 Don't use empty structure initializers.
30627 Change types used in bitfields to be `int's.
30628 Remove all void-pointer arithmetic.
30630 Fredrik Kuivinen (1):
30631 blame: Add --time to produce raw timestamps
30633 Jakub Narebski (15):
30634 Update gitweb README: gitweb is now included with git
30635 Move gitweb style to gitweb.css
30636 gitweb: safely output binary files for 'blob_plain' action
30637 gitweb: text files for 'blob_plain' action without charset by default
30638 Fix gitweb stylesheet
30639 Make CSS file gitweb/gitweb.css more readable
30640 gitweb: add type="text/css" to stylesheet link
30641 Fix: Support for the standard mime.types map in gitweb
30642 gitweb: A couple of page title tweaking
30643 gitweb: style done with stylesheet
30644 gitweb: whitespace cleanup
30645 Add git version to gitweb output
30646 Move $gitbin earlier in gitweb.cgi
30647 gitweb: Make use of $PATH_INFO for project parameter
30648 gitweb: whitespace cleanup around '='
30650 Johannes Schindelin (6):
30651 diff options: add --color
30652 Initialize lock_file struct to all zero.
30653 Fix setting config variables with an alternative GIT_CONFIG
30654 Read configuration also from $HOME/.gitconfig
30655 repo-config: Fix late-night bug
30656 git_config: access() returns 0 on success, not > 0
30658 Junio C Hamano (31):
30659 Revert all the rev-list option parsing changes.
30660 Clean-up Geert's similarity fingerprint code.
30661 Extract "log [diff options]" parser out.
30662 whatchanged options parser fix.
30663 Built-in git-whatchanged
30665 Try using Geert similarity code in pack-objects.
30666 Retire rabinpoly fingerprinting code
30667 Fix mismerged update-index from jc/cache-tree branch.
30668 read-tree: --prefix=<path>/ option.
30669 write-tree: --prefix=<path>
30670 read-tree: reorganize bind_merge code.
30671 fetch-pack: give up after getting too many "ack continue"
30672 Fix earlier mismerges.
30673 shared repository: optionally allow reading to "others".
30674 gitk: rereadrefs needs listrefs
30676 t5100: mailinfo and mailsplit tests.
30677 mailinfo: ignore blanks after in-body headers.
30678 fix rfc2047 formatter.
30679 xdiff: minor changes to match libxdiff-0.21
30680 Restore SIGCHLD to SIG_DFL where we care about waitpid().
30681 checkout -f: do not leave untracked working tree files.
30682 upload-pack: avoid sending an incomplete pack upon failure
30683 upload-pack: prepare for sideband message support.
30684 Retire git-clone-pack
30685 upload-pack/fetch-pack: support side-band communication
30686 Add renaming-rebase test.
30687 daemon: send stderr to /dev/null instead of closing.
30688 rebase --merge: fix for rebasing more than 7 commits.
30689 Makefile: do not force unneeded recompilation upon GIT_VERSION changes
30691 Linus Torvalds (9):
30692 Tentative built-in "git show"
30693 gitweb.cgi history not shown
30694 Shrink "struct object" a bit
30695 Move "void *util" from "struct object" into "struct commit"
30696 Some more memory leak avoidance
30697 Remove "refs" field from "struct object"
30698 Add specialized object allocator
30699 Add "named object array" concept
30700 Fix grow_refs_hash()
30702 Lukas Sandström (6):
30703 Make git-write-tree a builtin
30704 Make git-mailsplit a builtin
30705 Make git-mailinfo a builtin
30706 Make git-stripspace a builtin
30707 Make git-update-index a builtin
30708 Make git-update-ref a builtin
30710 Martin Langhoff (3):
30711 cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
30712 cvsimport: complete the cvsps run before starting the import
30713 cvsimport: keep one index per branch during import
30716 date.c: improve guess between timezone offset and year.
30718 Paul Mackerras (1):
30719 Fix PPC SHA1 routine for large input buffers
30722 Implement safe_strncpy() as strlcpy() and use it more.
30725 Support for extracting configuration from different files
30726 Support for the standard mime.types map in gitweb
30729 git-tar-tree: Simplify write_trailer()
30730 git-tar-tree: documentation update
30731 git-tar-tree: no more void pointer arithmetic
30732 Make release tarballs friendlier to older tar versions
30734 Sean Estabrooks (1):
30735 Add a "--notags" option for git-p4import.
30737 Sven Verdoolaege (1):
30738 git-cvsexportcommit.perl: fix typo
30741 gitweb: Use $hash_base as $search_hash if possible
30743 Uwe Kleine-König (1):
30744 Fix possible out-of-bounds array access
30747 auto-detect changed prefix and/or changed build flags
30748 Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
30751 Version v1.4.0; changes since v1.4.0-rc2:
30752 -----------------------------------------
30754 Horst H. von Brand (1):
30755 Fix formatting of Documentation/git-clone.txt
30757 Junio C Hamano (7):
30758 allow working in repositories with textual symref HEAD
30759 git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
30760 git-rm: honor -n flag.
30761 builtin-init-db: spell the in-program configuration variable in lowercase.
30762 shared repository - add a few missing calls to adjust_shared_perm().
30763 git-clone: fix --bare over dumb-http
30767 first working version
30844 Make the tag view look like commit header.
30845 allow sorting of index page by project path, owner and age
30846 make index page sorting more visible and increase RSS item count
30847 fix search parsing, later git does not print a trailing space
30848 don't chop_str if adding ... is longer than the original
30849 Show tooltips (like this one :)) containing full titles for truncated commit titles in the summary and shortlog views.
30852 common input validation to allow passing of textual hash id's
30854 translate reference into hash while reading a commit
30855 fix typo in link parameter of git_commit
30857 switch to git-rev-list for commit reading
30859 start searching at the current $hash value
30861 rename "branches" to "heads"
30863 provide filename for "save as" in plaintext views
30864 add Expires: +1d header to commit and commitdiff pages
30867 update the test files to have a diff
30868 escape '+' and ' ' in url's
30869 make ' ' and '+' in filenames some kind of working
30871 escape ' ' with '+' in url's
30872 replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
30874 add missing esc() rename
30880 add broken latin encoding to test file
30881 set logo output to raw mode
30883 allow utf8 characters in url parameter escape
30886 fix quoted filename lookup
30888 fix "rename" output
30894 attach tag to the link
30897 fix leading whitespace in commit text
30899 define default colors
30901 resolve textual hashes when looking up "refs"
30903 fix: Use of uninitialized value
30905 handle utf8 characters from /etc/passwd
30907 remove Christian's email address
30912 check for error return from fork()
30915 Built-in git-get-tar-commit-id
30918 prepend '--' to filelist when calling git-diff-tree
30920 Uwe Kleine-König (1):
30921 Document git-clone --use-separate-remote
30924 Add <author> and <guid> to RSS feed
30927 Version v1.4.0-rc2; changes since v1.4.0-rc1:
30928 ---------------------------------------------
30931 Some doc typo fixes
30932 config.txt grammar, typo, and asciidoc fixes
30933 git-cvsserver asciidoc formatting tweaks
30935 Horst H. von Brand (1):
30936 Cleanup git-send-email.perl:extract_valid_email
30938 Johannes Schindelin (1):
30939 If you have a config containing something like this:
30942 Refactor git_tcp_connect() functions a little.
30945 Misc doc improvements
30946 Document git-ls-tree --fullname
30948 Junio C Hamano (12):
30949 git alias: try alias last.
30950 send-email: be more lenient and just catch obvious mistakes.
30951 send-email: a bit more careful domain regexp.
30952 git-format-patch: add --output-directory long option again
30954 Make index file locking code reusable to others.
30955 refs.c: convert it to use lockfile interface.
30956 ref-log: style fixes.
30957 Documentation: add missing docs make check-docs found.
30958 make clean: remove dist-doc targets.
30959 Documentation: git-ls-tree (typofix)
30960 Documentation: add another example to git-ls-files
30962 Nick Hengeveld (2):
30964 http-fetch: fix possible segfault
30966 Paul Mackerras (12):
30967 gitk: Make a row of controls for controlling highlighting
30968 gitk: Highlight entries in the file list as well
30969 gitk: Highlight paths of interest in tree view as well
30970 gitk: First cut at a search function in the patch/file display window
30971 gitk: Improve the text window search function
30972 gitk: Move "pickaxe" find function to highlight facility
30973 gitk: Fix bug in highlight stuff when no line is selected
30974 gitk: Provide ability to highlight based on relationship to selected commit
30975 gitk: Add a goto next/previous highlighted commit function
30976 gitk: Show nearby tags
30977 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
30978 gitk: Re-read the descendent/ancestor tag & head info on update
30981 Document git aliases support
30982 Documentation: git aliases
30985 Off-by-one error in get_path_prefix(), found by Valgrind
30987 Robert Fitzsimons (1):
30988 builtin-grep: pass ignore case option to external grep
30991 Version v1.4.0-rc1; changes since v1.3.3:
30992 -----------------------------------------
30995 make update-index --chmod work with multiple files and --stdin
30996 remove superflous "const"
30998 Aneesh Kumar K.V (3):
30999 gitview: Add key binding for F5.
31000 gitview: Move the console error messages to message dialog
31001 gitview: Add some useful keybindings.
31003 Björn Engelmann (2):
31004 remove the artificial restriction tagsize < 8kb
31005 add more informative error messages to git-mktag
31007 Catalin Marinas (1):
31008 Add a test-case for git-apply trying to add an ending line
31010 Christian Couder (1):
31011 Builtin git-rev-parse.
31013 Dennis Stosberg (3):
31014 git-write-tree writes garbage on sparc64
31015 git-clean fails on files beginning with a dash
31016 Update documentation for git-format-patch
31018 Dmitry V. Levin (2):
31019 execv_git_cmd: Fix stack buffer overflow.
31020 git_exec_path, execv_git_cmd: ignore empty environment variables
31023 git-cvsimport: Handle "Removed" from pserver
31025 Eric W. Biederman (8):
31026 Implement git-quiltimport
31027 Implement a --dry-run option to git-quiltimport
31028 Make read_one_header_line return a flag not a length.
31029 Move B and Q decoding into check header.
31030 Refactor commit messge handling.
31031 In handle_body only read a line if we don't already have one.
31032 More accurately detect header lines in read_one_header_line
31033 Allow in body headers beyond the in body header prefix.
31036 git-svn: documentation updates
31038 send-email: address expansion for common mailers
31039 Install git-send-email by default
31040 send-email: allow sendmail binary to be used instead of SMTP
31041 send-email: quiet some warnings, reject invalid addresses
31042 commit: allow --pretty= args to be abbreviated
31043 git-svn: starting a 1.1.0-pre development version
31044 git-svn: ignore expansion of svn:keywords
31045 t3300-funny-names: shell portability fixes
31046 tests: Remove heredoc usage inside quotes
31047 t5500-fetch-pack: remove local (bashism) usage.
31048 t6000lib: workaround a possible dash bug
31049 git-svn: t0001: workaround a heredoc bug in old versions of dash
31050 git-svn: remove assertion that broke with older versions of svn
31052 Florian Forster (1):
31053 git-svnimport: Improved detection of merges.
31055 Fredrik Kuivinen (2):
31056 blame: Fix path pruning
31057 Update the documentation for git-merge-base
31059 Horst H. von Brand (4):
31060 Fix some documentation typoes
31061 Documentation: Spelling fixes
31062 Add example xinetd(8) configuration to Documentation/everyday.txt
31063 Fix Documentation/everyday.txt: Junio's workflow
31065 J. Bruce Fields (7):
31066 tutorial: replace "whatchanged" by "log"
31067 tutorial: expanded discussion of commit history
31068 tutorial: add discussion of index file, object database
31069 documentation: mention gitk font adjustment in tutorial
31070 documentation: add brief mention of cat-file to tutorial part I
31071 Documentation: retitle the git-core tutorial
31072 Documentation: fix a tutorial-2 typo
31075 cvsimport: use git-update-index --index-info
31076 cvsimport: cleanup commit function
31077 cvsimport: set up commit environment in perl instead of using env
31078 cat-file: document -p option
31079 cvsimport: avoid "use" with :tag
31080 handle concurrent pruning of packed objects
31081 sha1_file: avoid re-preparing duplicate packs
31084 Don't write directly to a make target ($@).
31086 Johannes Schindelin (25):
31087 builtin-push: resurrect parsing of Push: lines
31088 cache-tree: replace a sscanf() by two strtol() calls
31089 builtin-push: also ask config for remote information
31090 fetch, pull: ask config for remote information
31091 repo-config: fix segfault with no argument.
31092 repo-config: trim white-space before comment
31093 repo-config: support --get-regexp
31094 repo-config: deconvolute logics
31095 fetch, pull: ask config for remote information
31096 Add a conversion tool to migrate remote information into the config
31097 builtin-push: --all and --tags _are_ explicit refspecs
31098 Teach fmt-patch to write individual files.
31099 fmt-patch: output file names to stdout
31100 fmt-patch: implement -o <dir>
31101 Teach fmt-patch about --numbered
31102 Teach fmt-patch about --keep-subject
31103 fmt-patch: understand old <his> notation
31104 Fix users of prefix_path() to free() only when necessary
31105 Fix users of prefix_path() to free() only when necessary
31106 Fix crash when reading the empty tree
31107 diff family: add --check option
31108 fmt-patch: Support --attach
31109 git-format-patch --start-number <n>
31110 send-email: only 'require' instead of 'use' Net::SMTP
31111 format-patch: resurrect extra headers from config
31113 Josef Weidendorfer (1):
31114 gitk: Add a visual tag for remote refs
31116 Junio C Hamano (156):
31117 Fix up default abbrev in setup_revisions() argument parser.
31118 Fix up rev-list option parsing.
31119 Split init_revisions() out of setup_revisions()
31120 rev-list option parser fix.
31121 Built-in git-whatchanged.
31122 Do not fork PAGER=cat
31123 Simplify common default options setup for built-in log family.
31124 log/whatchanged/show - log formatting cleanup.
31125 rev-list --header: output format fix
31126 git.c: LOGSIZE is unused after log printing cleanup.
31127 combine-diff: show diffstat with the first parent.
31128 Fix "git log --stat": make sure to set recursive with --stat.
31129 Tentative built-in format-patch.
31130 sha1_name.c: prepare to make get_tree_entry() reusable from others.
31131 sha1_name.c: no need to include diff.h; tree-walk.h will do.
31132 get_tree_entry(): make it available from tree-walk
31133 Minor tweak on subject line in --pretty=email
31134 diff: move diff.c to diff-lib.c to make room.
31135 Add git-unresolve <paths>...
31136 diff --stat: do not drop rename information.
31137 git-update-index --unresolve
31138 rename internal format-patch wip
31139 Makefile: dependency for builtin-help.o
31140 Add colordiff for git to contrib/colordiff.
31141 Fix "git show --stat"
31144 git-fmt-patch: thinkofix to show [PATCH] properly.
31145 Libified diff-index: backward compatibility fix.
31146 read-cache/write-cache: optionally return cache checksum SHA1.
31148 Update write-tree to use cache-tree.
31149 Invalidate cache-tree entries for touched paths in git-apply.
31150 Use cache-tree in update-index.
31151 Add test-dump-cache-tree
31152 cache-tree: protect against "git prune".
31153 index: make the index file format extensible.
31154 Teach fsck-objects about cache-tree.
31155 cache-tree: sort the subtree entries.
31156 test-dump-cache-tree: report number of subtrees.
31157 Makefile: remove and create libgit.a from scratch.
31158 diff --stat: show complete rewrites consistently.
31159 git-cvsserver: typofixes
31160 t0000-basic: Add ls-tree recursive test back.
31161 Makefile: remove and create xdiff library from scratch.
31162 commit-tree: allow generic object name for the tree as well.
31163 revision parsing: make "rev -- paths" checks stronger.
31164 t0000-basic: more commit-tree tests.
31165 update-index: when --unresolve, smudge the relevant cache-tree entries.
31166 read-tree: teach 1 and 2 way merges about cache-tree.
31167 read-tree: teach 1-way merege and plain read to prime cache-tree.
31168 diff-index: fix compilation warnings.
31169 cache_tree_update: give an option to update cache-tree only.
31170 test-dump-cache-tree: validate the cached data as well.
31171 pack-objects: update size heuristucs.
31172 built-in count-objects.
31173 cache-tree.c: typefix
31175 built-in diff: assorted updates.
31176 builtin-diff.c: die() formatting type fix.
31177 Fix builtin-push to honor Push: lines in remotes file.
31178 Extended SHA1 -- "rev^@" syntax to mean "all parents"
31179 get_sha1(): :path and :[0-3]:path to extract from index.
31180 built-in "git grep"
31181 Use RFC2822 dates from "git fmt-patch".
31182 builtin-grep: wildcard pathspec fixes
31183 builtin-grep: support '-l' option.
31184 builtin-grep: do not use setup_revisions()
31185 fsck-objects: mark objects reachable from cache-tree
31186 builtin-count-objects: make it official.
31187 builtin-diff: call it "git-diff", really.
31188 builtin-log/whatchanged/show: make them official.
31189 show-branch: omit uninteresting merges.
31190 builtin-push: make it official.
31191 builtin-grep: printf %.*s length is int, not ptrdiff_t.
31192 Revert "fetch, pull: ask config for remote information"
31193 builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
31194 builtin-grep: allow more than one patterns.
31195 builtin-grep: support -c (--count).
31196 builtin-grep: support -w (--word-regexp).
31197 builtin-grep: tighten path wildcard vs tree traversal.
31198 core.prefersymlinkrefs: use symlinks for .git/HEAD
31199 repo-config: readability fixups.
31200 builtin-count-objects: open packs when running -v
31201 Fix test-dump-cache-tree in one-tree disappeared case.
31202 read-tree: invalidate cache-tree entry when a new index entry is added.
31203 cache-tree: a bit more debugging support.
31204 builtin-grep: terminate correctly at EOF
31205 builtin-grep: binary files -a and -I
31206 fsck-objects: do not segfault on missing tree in cache-tree
31207 builtin-grep: -L (--files-without-match).
31208 Makefile: do not link rev-list any specially.
31209 delta: stricter constness
31210 pack-object: squelch eye-candy on non-tty
31212 binary diff: further updates.
31213 update-index --unresolve: work from a subdirectory.
31214 checkout-index: plug memory leak from prefix_path()
31215 update-index: plug memory leak from prefix_path()
31216 update-index --again
31217 update-index --again: take optional pathspecs
31218 binary diff and apply: testsuite.
31219 Teach -f <file> option to builtin-grep.
31220 builtin-grep: documentation
31221 get_sha1() - fix infinite loop on nonexistent stage.
31222 Teach git-clean optional <paths>... parameters.
31223 builtin-grep: tighten argument parsing.
31224 builtin-grep: typofix
31225 builtin-grep: -w fix
31226 builtin-grep: -F (--fixed-strings)
31227 checkout: use --aggressive when running a 3-way merge (-m).
31228 diffstat rename squashing fix.
31229 read-tree -u one-way merge fix to check out locally modified paths.
31230 apply --numstat: show new name, not old name.
31231 builtin-grep: unparse more command line options.
31232 apply --cached: apply a patch without using working tree.
31233 git-am: use apply --cached
31234 builtin-diff: fix comparison between two blobs.
31235 merge-base: Clarify the comments on post processing.
31236 read-tree -m -u: do not overwrite or remove untracked working tree files.
31237 builtin-grep: workaround for non GNU grep.
31238 Revert "builtin-grep: workaround for non GNU grep."
31239 apply --cached: do not check newly added file in the working tree
31240 builtin-add: fix unmatched pathspec warnings.
31241 builtin-diff: do not say files are renamed when blob and file are given
31242 Fix build procedure for builtin-init-db
31243 built-in tar-tree and remote tar-tree
31244 git-format-patch: now built-in.
31245 checkdiff_consume: strtol parameter fix.
31246 git-rebase: use canonical A..B syntax to format-patch
31247 tutorial-2: typofix in examples.
31248 mailinfo: skip bogus UNIX From line inside body
31249 CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
31250 builtin format-patch: squelch content-type for 7-bit ASCII
31251 diff: minor option combination fix.
31252 fetch-pack: output refs in the order they were given on the command line.
31253 Tutorial #2: broken link fix.
31254 builtin-rm: squelch compiler warnings.
31255 cvsimport: do not barf on creation of an empty file.
31256 apply: force matching at the beginning.
31257 fetch.c: remove an unused variable and dead code.
31258 ls-remote: fix rsync:// to report HEAD
31259 mailinfo: More carefully parse header lines in read_one_header_line()
31260 gitk: start-up bugfix
31261 built-in format-patch: various fixups.
31262 format-patch: -n and -k are mutually exclusive.
31263 Let git-clone to pass --template=dir option to git-init-db.
31264 git-fetch: avoid using "case ... in (arm)"
31265 adjust to the rebased series by Linus.
31266 send-email: do not pass bogus address to local sendmail binary
31267 format-patch --signoff
31268 fetch.c: do not pass uninitialized lock to unlock_ref().
31269 fetch.c: do not call process_tree() from process_tree().
31270 fetch: do not report "same" unless -verbose.
31271 read-tree --reset: update working tree file for conflicted paths.
31272 rev-parse: tighten constness properly.
31274 Linus Torvalds (60):
31275 Common option parsing for "git log --diff" and friends
31276 Tentative built-in "git show"
31277 Fixes for option parsing
31278 Log message printout cleanups
31279 Log message printout cleanups (#2)
31280 Log message printout cleanups (#3): fix --pretty=oneline
31281 Fix uninteresting tags in new revision parsing
31282 get_sha1() shorthands for blob/tree objects
31283 Allow "git repack" users to specify repacking window/depth
31284 git log: don't do merge diffs by default
31285 Split up builtin commands into separate files from git.c
31286 Fix "git help -a" terminal autosizing
31288 Fix "git-log --parents" breakage post v1.3.0
31289 sha1_to_hex() usage cleanup
31290 git diff: support "-U" and "--unified" options properly
31291 Allow one-way tree merge to remove old files
31292 Simplify "git reset --hard"
31293 builtin-grep: use external grep when we can take advantage of it
31294 read-tree --reset -u fix.
31295 Fix silly typo in new builtin grep
31296 Remove old "git-grep.sh" remnants
31297 libify git-ls-files directory traversal
31298 Clean up git-ls-file directory walking library interface
31299 Do "git add" as a builtin
31300 builtin-add: warn on unmatched pathspecs
31301 builtin-grep: workaround for non GNU grep.
31302 Remove old "git-add.sh" remnants
31303 Prevent bogus paths from being added to the index.
31304 Make "git rev-list" be a builtin
31305 Libify the index refresh logic
31306 Move pathspec matching from builtin-add.c into dir.c
31307 Add builtin "git rm" command
31308 cvsimport: repack every kilo-commits.
31309 apply: treat EOF as proper context.
31310 Clean up sha1 file writing
31311 bogus "fatal: Not a git repository"
31312 t1002: use -U0 instead of --unified=0
31313 Fix "--abbrev=xyz" for revision listing
31314 Fix memory leak in "git rev-list --objects"
31315 Don't use "sscanf()" for tree mode scanning
31316 Add raw tree buffer info to "struct tree"
31317 Make "tree_entry" have a SHA1 instead of a union of object pointers
31318 Switch "read_tree_recursive()" over to tree-walk functionality
31319 Remove "tree->entries" tree-entry list from tree parser
31320 Make "struct tree" contain the pointer to the tree buffer
31321 Make "tree_entry" have a SHA1 instead of a union of object pointers
31322 Switch "read_tree_recursive()" over to tree-walk functionality
31323 builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
31324 Remove "tree->entries" tree-entry list from tree parser
31325 fsck-objects: avoid unnecessary tree_entry_list usage
31326 Remove unused "zeropad" entry from tree_list_entry
31327 Convert "mark_tree_uninteresting()" to raw tree walker
31328 Convert fetch.c: process_tree() to raw tree walker
31329 Remove last vestiges of generic tree_entry_list
31330 tree_entry(): new tree-walking helper function
31331 read-tree: fix eye-candy.
31332 Fix typo in tutorial-2.txt
31333 rev-list: fix process_tree() conversion.
31334 pack-objects: improve path grouping heuristics.
31336 Lukas Sandström (2):
31337 Make git-check-format-ref a builtin.
31338 SubmittingPatches: The download location of External Editor has moved
31340 Martin Langhoff (7):
31341 git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
31342 cvsserver: use git-rev-list instead of git-log
31343 cvsserver: use git-rev-list instead of git-log
31344 cvsimport: minor fixups
31345 cvsimport: replace anonymous sub ref with a normal sub
31346 cvsimport: introduce -L<imit> option to workaround memory leaks
31347 cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
31350 Transitively read alternatives
31351 test case for transitive info/alternates
31352 clone: don't clone the info/alternates file
31353 git help: remove whatchanged from list of common commands
31354 Documentation/Makefile: remove extra /
31355 Add instructions to commit template.
31358 Added logged warnings for CVS error returns
31359 Many fixes for most operations in Eclipse.
31360 Change to allow subdir updates from Eclipse
31362 Matthias Kestenholz (1):
31363 add documentation for update-index --unresolve
31365 Matthias Lederhofer (1):
31366 git status: skip empty directories, and add -u to show all untracked files
31368 Nick Hengeveld (3):
31369 git-fetch: resolve remote symrefs for HTTP transport
31370 http: prevent segfault during curl handle reuse
31371 builtin-push: don't pass --thin to HTTP transport
31373 Nicolas Pitre (10):
31374 split the diff-delta interface
31375 use delta index data when finding best delta matches
31376 replace adler32 with Rabin's polynomial in diff-delta
31377 tiny optimization to diff-delta
31378 improve diff-delta with sparse and/or repetitive data
31379 improve base85 generated assembly code
31380 fix diff-delta bad memory access
31381 simple euristic for further free packing improvements
31382 pack-object: slightly more efficient
31383 improve depth heuristic for maximum delta size
31385 Paul Mackerras (19):
31386 gitk: Implement multiple views
31387 gitk: Make File->Update work properly again
31388 gitk: Fix various bugs in the view support
31389 gitk: Don't reread git-rev-list output from scratch on view switch
31390 gitk: Remember the view in the history list
31391 gitk: Let git-rev-list do the argument list parsing
31392 gitk: Use git-rev-parse only to identify file/dir names on cmd line
31393 gitk: Implement "permanent" views (stored in ~/.gitk)
31394 gitk: add menu item for editing the current view
31395 gitk: Use a text widget for the file list
31396 gitk: Add a tree-browsing mode
31397 gitk: Basic support for highlighting one view within another
31398 gitk: Fix file list display when files are renamed
31399 gitk: Allow view to specify arbitrary arguments to git-rev-list
31400 gitk: Fix display of "(...)" for parents/children we haven't drawn
31401 Provide a way to flush git-diff-tree's output
31402 gitk: Fix bug where page-up/down wouldn't always work properly
31403 gitk: show_error fix
31404 Make git-diff-tree indicate when it flushes
31407 Add git-quiltimport to .gitignore.
31408 Builtin git-ls-files.
31409 Builtin git-ls-tree.
31410 Builtin git-tar-tree.
31411 Builtin git-read-tree.
31412 Builtin git-commit-tree.
31414 Builtin git-show-branch.
31415 Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
31417 Peter Hagervall (1):
31418 Sparse fix for builtin-diff
31421 git-repo-config --list support
31422 Deprecate usage of git-var -l for getting config vars list
31423 Call builtin ls-tree in git-cat-file -p
31426 git-send-email: Add References: headers to emails, in addition to In-Reply-To:
31427 Add support for --bcc to git-send-email.
31428 Fix a bug in email extraction used in git-send-email.
31429 Add a basic test case for git send-email, and fix some real bugs discovered.
31431 Salikh Zakirov (1):
31432 Fixed Cygwin CR-munging problem in mailsplit
31435 Document that "git add" only adds non-ignored files.
31437 Sean Estabrooks (19):
31438 Add --continue and --abort options to git-rebase.
31439 Several trivial documentation touch ups.
31440 Fix up docs where "--" isn't displayed correctly.
31441 Update git-unpack-objects documentation.
31442 Clarify git-cherry documentation.
31443 Another config file parsing fix.
31444 t1300-repo-config: two new config parsing tests.
31445 Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
31446 Make git rebase interactive help match documentation.
31447 Add "--summary" option to git diff.
31448 Convert some "apply --summary" users to "diff --summary".
31449 Strip useless "tags/" prefix from git-tag -l output
31450 Allow pickaxe and diff-filter options to be used by git log.
31451 Avoid segfault in diff --stat rename output.
31452 Change GIT-VERSION-GEN to call git commands with "git" not "git-".
31453 Install git builtins into gitexecdir rather than bindir.
31454 Remove possible segfault in http-fetch.
31455 --summary output should print immediately after stats.
31456 A Perforce importer for git.
31458 Serge E. Hallyn (1):
31459 socksetup: don't return on set_reuse_addr() error
31462 gitk: Display commit messages with word wrap
31464 Shawn O. Pearce (24):
31465 Remove unnecessary local in get_ref_sha1.
31466 Improve abstraction of ref lock/write.
31467 Convert update-ref to use ref_lock API.
31468 Log ref updates to logs/refs/<ref>
31469 Support 'master@2 hours ago' syntax
31470 Fix ref log parsing so it works properly.
31471 General ref log reading improvements.
31472 Added logs/ directory to repository layout.
31473 Force writing ref if it doesn't exist.
31474 Log ref updates made by fetch.
31475 Change 'master@noon' syntax to 'master@{noon}'.
31476 Correct force_write bug in refs.c
31477 Change order of -m option to update-ref.
31478 Include ref log detail in commit, reset, etc.
31479 Create/delete branch ref logs.
31480 Enable ref log creation in git checkout -b.
31481 Reference git-check-ref-format in git-branch.
31482 Elaborate on why ':' is a bad idea in a ref name.
31483 Built git-upload-tar should be ignored.
31484 Verify git-commit provides a reflog message.
31485 Test that git-branch -l works.
31486 Remove unnecessary output from t3600-rm.
31487 Improved pack format documentation.
31488 Allow multiple -m options to git-commit.
31490 Tilman Sauerbeck (1):
31491 Documentation/Makefile: create tarballs for the man pages and html files
31494 Builtin git-init-db
31495 Builtin git-cat-file
31496 gitk: Replace "git-" commands with "git "
31499 NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
31500 Problem: 'trap...exit' causes error message when /bin/sh is ash.
31503 Do not call 'cmp' with non-existant -q flag.
31504 Document current cvsexportcommit limitations.
31505 Make cvsexportcommit create parent directories as needed.
31508 Version v1.3.3; changes since v1.3.2:
31509 -------------------------------------
31512 include header to define uint32_t, necessary on Mac OS X
31514 Dennis Stosberg (2):
31515 Fix git-pack-objects for 64-bit platforms
31516 Fix compilation on newer NetBSD systems
31518 Dmitry V. Levin (1):
31519 Separate object name errors from usage errors
31522 apply: fix infinite loop with multiple patches with --index
31523 Install git-send-email by default
31525 Johannes Schindelin (1):
31526 repo-config: trim white-space before comment
31528 Junio C Hamano (6):
31529 core.prefersymlinkrefs: use symlinks for .git/HEAD
31530 repo-config: document what value_regexp does a bit more clearly.
31531 Fix repo-config set-multivar error return path.
31532 Documentation: {caret} fixes (git-rev-list.txt)
31533 checkout: use --aggressive when running a 3-way merge (-m).
31534 Fix pack-index issue on 64-bit platforms a bit more portably.
31536 Linus Torvalds (3):
31537 Fix "git diff --stat" with long filenames
31538 revert/cherry-pick: use aggressive merge.
31539 git config syntax updates
31542 clone: keep --reference even with -l -s
31543 repack: honor -d even when no new pack was created
31545 Matthias Lederhofer (1):
31546 core-tutorial.txt: escape asterisk
31549 Release config lock if the regex is invalid
31551 Sean Estabrooks (3):
31552 Fix for config file section parsing.
31553 Another config file parsing fix.
31554 Ensure author & committer before asking for commit message.
31557 read-cache.c: use xcalloc() not calloc()
31560 Version v1.3.2; changes since v1.3.1:
31561 -------------------------------------
31564 git-format-patch: Use rfc2822 compliant date.
31567 Alphabetize the glossary.
31568 Added definitions for a few words:
31569 Add a few more words to the glossary.
31571 Junio C Hamano (4):
31573 commit-tree.c: check_valid() microoptimization.
31574 verify-pack: check integrity in a saner order.
31575 git-am --resolved: more usable error message.
31577 Linus Torvalds (1):
31578 Fix filename verification when in a subdirectory
31580 Martin Langhoff (1):
31581 git-send-email: fix version string to be valid perl
31583 Matthias Kestenholz (3):
31584 annotate: fix warning about uninitialized scalar
31585 annotate: display usage information if no filename was given
31586 fix various typos in documentation
31588 Robert Shearman (1):
31589 Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
31591 Sean Estabrooks (4):
31592 Update the git-branch man page to include the "-r" option,
31593 Fix up remaining man pages that use asciidoc "callouts".
31594 Properly render asciidoc "callouts" in git man pages.
31595 Fix trivial typo in git-log man page.
31598 Version v1.3.1; changes since v1.3.0:
31599 -------------------------------------
31602 Fix filename scaling for binary files
31604 Junio C Hamano (5):
31605 git-merge: a bit more readable user guidance.
31606 pre-commit hook: complain about conflict markers.
31607 git-commit --amend: two fixes.
31608 pack-objects: do not stop at object that is "too small"
31609 mailinfo: decode underscore used in "Q" encoding properly.
31611 Linus Torvalds (1):
31612 git-log produces no output
31615 fix pack-object buffer size
31617 Paul Mackerras (1):
31618 rev-parse: better error message for ambiguous arguments
31621 Document git-var -l listing also configuration variables
31622 Document the configuration file
31625 Reintroduce svn pools to solve the memory leak.
31627 Serge E. Hallyn (1):
31628 socksetup: don't return on set_reuse_addr() error
31630 Shawn O. Pearce (1):
31631 Document git-clone --reference
31634 Version v1.3.0; changes since v1.3.0-rc4:
31635 -----------------------------------------
31637 A Large Angry SCM (1):
31640 Herbert Valerio Riedel (1):
31641 git-svnimport symlink support
31643 Johannes Schindelin (2):
31644 diff-options: add --patch-with-stat
31645 pager: do not fork a pager if PAGER is set to empty.
31648 Add git-annotate(1) and git-blame(1)
31650 Junio C Hamano (9):
31651 rev-list --bisect: limit list before bisecting.
31652 diff-tree: typefix.
31653 diff --stat: do not do its own three-dashes.
31654 diff-files --stat: do not dump core with unmerged index.
31655 reading $GIT_DIR/info/graft - skip comments correctly.
31656 rev-list --boundary: show boundary commits even when limited otherwise.
31657 packed_object_info_detail(): check for corrupt packfile.
31658 diff --stat: make sure to set recursive.
31661 Linus Torvalds (1):
31662 Support "git cmd --help" syntax
31664 Paul Mackerras (1):
31665 gitk: Fix bug caused by missing commitlisted elements
31667 Serge E. Hallyn (5):
31668 cleanups: Fix potential bugs in connect.c
31669 cleanups: Remove unused vars from combine-diff.c
31670 cleanups: Remove impossible case in quote.c
31671 cleanups: prevent leak of two strduped strings in config.c
31672 cleanups: remove unused variable from exec_cmd.c
31675 Allow empty lines in info/grafts
31678 Version v1.3.0-rc4; changes since v1.3.0-rc3:
31679 ---------------------------------------------
31681 Davide Libenzi (1):
31682 xdiff: post-process hunks to make them consistent.
31684 Dennis Stosberg (2):
31685 Solaris 9 also wants our own unsetenv/setenv.
31686 Replace index() with strchr().
31688 Eric W. Biederman (1):
31689 Implement limited context matching in git-apply.
31691 Johannes Schindelin (2):
31692 diff-options: add --stat (take 2)
31693 diff-options: add --stat (take 2)
31695 Junio C Hamano (31):
31696 git-log: match rev-list --abbrev and --abbrev-commit
31697 diff: fix output of total-rewrite diff.
31698 diffcore-rename: fix merging back a broken pair.
31699 log-tree: separate major part of diff-tree.
31700 git log [diff-tree options]...
31701 Retire diffcore-pathspec.
31702 tree-diff: do not assume we use only one pathspec
31703 git log --full-diff
31705 blame and friends: adjust to multiple pathspec change.
31706 Retire git-log.sh (take#2)
31707 diff-* --patch-with-raw
31708 Retire git-log.sh (take #3)
31709 combine-diff: do not lose hunks with only deletion at end.
31710 combine-diff: fix hunks at the end (take #2).
31711 Retire t5501-old-fetch-and-upload test.
31712 git-commit: do not muck with commit message when no_edit is set.
31713 stripspace: make sure not to leave an incomplete line.
31714 combine-diff: type fix.
31715 Documentation: add a couple of missing docs.
31716 Makefile: $(MAKE) check-docs
31717 git-log: do not output excess blank line between commits
31718 t3600-rm: skip failed-remove test when we cannot make an unremovable file.
31719 Fix-up previous expr changes.
31720 diff --stat: no need to ask funcnames nor context.
31722 stripspace: incomplete line fix (take #2)
31723 Retire git-log.sh (take #4)
31724 git-log <diff-options> <paths> documentation
31725 "git cmd -h" for shell scripts.
31728 Linus Torvalds (4):
31729 Make "--parents" logs also be incremental
31730 When showing a commit message, do not lose an incomplete line.
31731 Use less memory in "git log"
31732 Clean up trailing whitespace when pretty-printing commits
31735 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables
31738 Shell utilities: Guard against expr' magic tokens.
31741 Improve the git-diff-tree -c/-cc documentation
31742 Document --patch-with-raw
31743 Separate the raw diff and patch with a newline
31746 Version v1.3.0-rc3; changes since v1.3.0-rc2:
31747 ---------------------------------------------
31750 Tweaks to make asciidoc play nice.
31752 Johannes Schindelin (3):
31753 cvsimport: use git-update-ref when updating
31754 On some platforms, certain headers need to be included before regex.h
31755 Fix compile with expat, but an old curl version
31758 Added Packing Heursitics IRC writeup.
31760 Junio C Hamano (16):
31761 git-clone: fix handling of upsteram whose HEAD does not point at master.
31762 combine-diff: use built-in xdiff.
31763 parse_date(): fix parsing 03/10/2006
31764 combine-diff: refactor built-in xdiff interface.
31765 diff_flush(): leakfix.
31766 combine-diff: move the code to parse hunk-header into common library.
31767 blame: use built-in xdiff
31768 date parsing: be friendlier to our European friends.
31769 blame.c: fix completely broken ancestry traversal.
31770 Match ofs/cnt types in diff interface.
31771 blame -S <ancestry-file>
31772 Add Documentation/technical/pack-format.txt
31773 Thin pack generation: optimization.
31774 rev-list --abbrev-commit
31775 count-delta: match get_delta_hdr_size() changes.
31778 Karl Hasselström (1):
31779 git-svnimport: Don't assume that copied files haven't changed
31782 Provide configurable UI font for gitk
31785 git-commit: document --amend
31788 gitk: Use git wrapper to run git-ls-remote.
31790 Mike McCormack (3):
31791 Avoid a divide by zero if there's no messages to send.
31792 Avoid a crash if realloc returns a different pointer.
31793 Add documentation for git-imap-send.
31795 Nick Hengeveld (1):
31796 http-fetch: add optional DAV-based pack list
31799 check patch_delta bounds more carefully
31801 Paul Mackerras (3):
31802 gitk: replace parent and children arrays with lists
31803 gitk: Add a help menu item to display key bindings
31804 gitk: Fix incorrect invocation of getmergediffline
31807 Add git-clean command
31808 gitk: Fix searching for filenames in gitk
31811 Support for pickaxe matching regular expressions
31813 Rutger Nijlunsing (1):
31814 gitk: add key bindings for selecting first and last commit
31816 Stephen Rothwell (1):
31817 gitk: allow goto heads
31820 Version v1.3.0-rc2; changes since v1.3.0-rc1:
31821 ---------------------------------------------
31823 Davide Libenzi (1):
31824 Clean-up trivially redundant diff.
31827 contrib/git-svn: force GIT_DIR to an absolute path
31828 contrib/git-svn: accept configuration via repo-config
31829 contrib/git-svn: documentation updates
31830 contrib/git-svn: ensure repo-config returns a value before using it
31831 contrib/git-svn: make sure our git-svn is up-to-date for test
31832 contrib/git-svn: handle array values correctly
31834 J. Bruce Fields (1):
31835 Documentation: revise top of git man page
31838 Add ALL_LDFLAGS to the git target.
31839 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
31842 fix repacking with lots of tags
31844 Junio C Hamano (14):
31845 rev-list --no-merges: argument parsing fix.
31846 rev-list: memory usage reduction.
31847 rev-list --boundary
31848 revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
31849 revision.c "..B" syntax: constness fix
31850 assume unchanged git: diff-index fix.
31851 tree/diff header cleanup.
31852 rev-list --boundary: fix re-injecting boundary commits.
31853 Makefile: many programs now depend on xdiff/lib.a having been built.
31854 revision: --topo-order and --unpacked
31855 revision: simplify argument parsing.
31856 revision: --max-age alone does not need limit_list() anymore.
31857 safe_fgets() - even more anal fgets()
31860 Linus Torvalds (5):
31861 Move "--parent" parsing into generic revision.c library code
31862 Make path-limiting be incremental when possible.
31863 revision: Fix --topo-order and --max-age with reachability limiting.
31864 Fix Solaris stdio signal handling stupidities
31865 pack-objects: be incredibly anal about stdio semantics
31868 xdiff: Show function names in hunk headers.
31870 Nick Hengeveld (2):
31871 git-ls-remote: send no-cache header when fetching info/refs
31872 Set HTTP user agent to git/GIT_VERSION
31874 Paul Mackerras (5):
31875 gitk: Use the new --boundary flag to git-rev-list
31876 gitk: Show diffs for boundary commits
31877 gitk: Prevent parent link from overwriting commit headline
31878 gitk: Allow top panes to scroll horizontally with mouse button 2
31879 gitk: Better workaround for arrows on diagonal line segments
31882 Use blob_, commit_, tag_, and tree_type throughout.
31883 Replace xmalloc+memset(0) with xcalloc.
31886 Remove useless pointer update
31887 Fix sparse warnings about usage of 0 instead of NULL
31888 Fix sparse warnings about non-ANSI function prototypes
31891 Make git-clone to take long double-dashed origin option (--origin)
31892 git-clone: exit early if repo isn't specified
31895 Version v1.3.0-rc1; changes since v1.2.6:
31896 -----------------------------------------
31899 PATCH: simplify calls to git programs in git-fmt-merge-msg
31900 workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
31902 Alexandre Julliard (12):
31903 Add an Emacs interface in contrib.
31904 git-format-patch: Always add a blank line between headers and body.
31905 contrib/emacs: Add an Emacs VC backend.
31906 git.el: Portability fixes for XEmacs and Emacs CVS.
31907 git.el: Set default directory before running the status mode setup hooks.
31908 git.el: Automatically update .gitignore status.
31909 git.el: Added support for Signed-off-by.
31910 git.el: Added customize support for all parameters.
31911 ls-files: Don't require exclude files to end with a newline.
31912 git.el: More robust handling of subprocess errors when returning strings.
31913 git.el: Get the default user name and email from the repository config.
31914 git.el: Added a function to diff against the other heads in a merge.
31917 git-svnimport: if a limit is specified, respect it
31919 Aneesh Kumar K.V (16):
31920 Add contrib/gitview from Aneesh.
31921 Add a README for gitview
31923 gitview: Read tag and branch information using git ls-remote
31924 gitview: Use monospace font to draw the branch and tag name
31925 gitview: Display the lines joining commit nodes clearly.
31926 gitview: Fix DeprecationWarning
31927 gitview: Bump the rev
31928 gitview: Code cleanup
31929 gitview: Fix the graph display .
31930 gitview: Fix the encoding related bug
31931 gitview: Remove trailing white space
31932 gitview: Some window layout changes.
31933 gitview: Set the default width of graph cell
31934 gitview: Use horizontal scroll bar in the tree view
31935 gitview: pass the missing argument _show_clicked_cb.
31938 git-rebase: Clarify usage statement and copy it into the actual documentation.
31939 New test to verify that when git-clone fails it cleans up the new directory.
31940 git-ls-files: Fix, document, and add test for --error-unmatch option.
31941 Add new git-rm command with documentation
31942 git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.
31944 Dmitry V. Levin (1):
31945 git/Documentation: fix SYNOPSIS style bugs
31948 Introducing contrib/git-svn.
31949 git-svn: fix revision order when XML::Simple is not loaded
31950 git-svn: ensure fetch always works chronologically.
31951 git-svn: remove files from the index before adding/updating
31952 git-svn: fix a typo in defining the --no-stop-on-copy option
31953 git-svn: allow --find-copies-harder and -l<num> to be passed on commit
31954 git-svn: Allow for more argument types for commit (from..to)
31955 git-svn: remove any need for the XML::Simple dependency
31956 git-svn: change ; to && in addremove()
31957 contrib/git-svn.txt: add a note about renamed/copied directory support
31958 git-svn: fix several corner-case and rare bugs with 'commit'
31959 contrib/git-svn: add Makefile, test, and associated ignores
31960 git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
31961 contrib/git-svn: add show-ignore command
31962 contrib/git-svn: optimize sequential commits to svn
31963 contrib/git-svn: version 0.10.0
31964 contrib/git-svn: tell the user to not modify git-svn-HEAD directly
31965 contrib/git-svn: correct commit example in manpage
31966 contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
31967 git-branch: add -r switch to list refs/remotes/*
31968 contrib/git-svn: add -b/--branch switch for branch detection
31969 contrib/git-svn: several small bug fixes and changes
31970 contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
31971 contrib/git-svn: allow --authors-file to be specified
31972 contrib/git-svn: cleanup option parsing
31973 contrib/git-svn: create a more recent master if one does not exist
31974 contrib/git-svn: avoid re-reading the repository uuid, it never changes
31975 contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
31976 contrib/git-svn: better documenting of CLI switches
31977 send-email: accept --no-signed-off-by-cc as the documentation states
31978 contrib/git-svn: fix a copied-tree bug in an overzealous assertion
31979 contrib/git-svn: fix svn compat and fetch args
31980 contrib/git-svn: remove the --no-stop-on-copy flag
31981 contrib/git-svn: fix a harmless warning on rebuild (with old repos)
31982 fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
31983 ls-tree: add --abbrev[=<n>] option
31984 ls-files: add --abbrev[=<n>] option
31985 contrib/git-svn: allow rebuild to work on non-linear remote heads
31986 send-email: use built-in time() instead of /bin/date '+%s'
31987 send-email: Change from Mail::Sendmail to Net::SMTP
31988 send-email: try to order messages in email clients more correctly
31989 send-email: lazy-load Email::Valid and make it optional
31990 contrib/git-svn: stabilize memory usage for big fetches
31992 Fernando J. Pereda (1):
31993 Allow building Git in systems without iconv
31996 AsciiDoc fix for tutorial
31997 Tweak asciidoc output to work with broken docbook-xsl
31998 Fix multi-paragraph list items in OPTIONS section
31999 Format tweaks for asciidoc.
32001 Fredrik Kuivinen (13):
32002 Add git-blame, a tool for assigning blame.
32004 git-blame: Make the output human readable
32005 git-blame: Use the same tests for git-blame as for git-annotate
32006 Fix some inconsistencies in the docs
32007 Remove trailing dot after short description
32008 Nicer output from 'git'
32009 Make it possible to not clobber object.util in sort_in_topological_order (take 2)
32010 rev-lib: Make it easy to do rename tracking (take 2)
32011 blame: Rename detection (take 2)
32012 blame: Nicer output
32013 blame: Fix git-blame <directory>
32014 Makefile: Add TAGS and tags targets
32016 J. Bruce Fields (1):
32017 Document git-rebase behavior on conflicts.
32020 Fix typo in git-rebase.sh.
32022 Jeff Muizelaar (2):
32023 cosmetics: change from 'See-Also' to 'See Also'
32024 documentation: add 'see also' sections to git-rm and git-add
32026 Johannes Schindelin (13):
32028 Optionally support old diffs
32030 Optionally work without python
32031 Fixes for ancient versions of GNU make
32032 avoid makefile override warning
32033 Really honour NO_PYTHON
32035 Use Ryan's git-annotate instead of jsannotate
32036 Warn about invalid refs
32037 Fix test case for some sed
32038 imap-send: Add missing #include for macosx
32039 Remove dependency on a file named "-lz"
32042 Add git-show reference
32043 Call out the two different uses of git-branch and fix a typo.
32044 Document the default source of template files.
32045 Clarify git-rebase example commands.
32046 Reference git-commit-tree for env vars.
32048 Rewrite synopsis to clarify the two primary uses of git-checkout.
32049 Clarify and expand some hook documentation.
32050 Removed bogus "<snap>" identifier.
32053 manpages: insert two missing [verse] markers for multi-line SYNOPSIS
32054 repo-config: give value_ a sane default so regexec won't segfault
32056 Josef Weidendorfer (1):
32057 git-mv: fix moves into a subdir from outside
32059 Junio C Hamano (137):
32060 "Assume unchanged" git
32061 "Assume unchanged" git: do not set CE_VALID with --refresh
32062 ls-files: debugging aid for CE_VALID changes.
32063 "Assume unchanged" git: --really-refresh fix.
32064 ls-files: split "show-valid-bit" into a different option.
32065 "assume unchanged" git: documentation.
32066 cache_name_compare() compares name and stage, nothing else.
32067 git-commit: Now --only semantics is the default.
32068 rebase: allow a hook to refuse rebasing.
32069 commit: detect misspelled pathspec while making a partial commit.
32070 rebase: allow rebasing onto different base.
32071 ls-files --error-unmatch pathspec error reporting fix.
32072 Detect misspelled pathspec to git-add
32073 packed objects: minor cleanup
32074 topo-order: make --date-order optional.
32075 pack-objects: reuse data from existing packs.
32076 pack-objects: finishing touches.
32077 git-repack: allow passing a couple of flags to pack-objects.
32078 git-tag: -l to list tags (usability).
32079 Add contrib/README.
32080 SubmittingPatches: note on whitespaces
32081 pack-objects: avoid delta chains that are too long.
32082 Make "empty ident" error message a bit more helpful.
32083 Delay "empty ident" errors until they really matter.
32084 Keep Porcelainish from failing by broken ident after making changes.
32085 fmt-merge-msg: say which branch things were merged into unless 'master'
32086 Allow git-mv to accept ./ in paths.
32087 Documentation: fix typo in rev-parse --short option description.
32088 fmt-merge-msg: do not add excess newline at the end.
32089 rev-list --objects-edge
32090 Thin pack - create packfile with missing delta base.
32091 send-pack --thin: use "thin pack" delta transfer.
32092 Add git-push --thin.
32093 Use thin pack transfer in "git fetch".
32094 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
32095 rerere: avoid open "-|" list form for Perl 5.6
32096 send-email: avoid open "-|" list form for Perl 5.6
32097 svnimport: avoid open "-|" list form for Perl 5.6
32098 cvsimport: avoid open "-|" list form for Perl 5.6
32099 Fix fmt-merge-msg counting.
32100 cherry-pick/revert: error-help message rewording.
32101 git-mktree: reverse of git-ls-tree.
32102 rev-list.c: fix non-grammatical comments.
32103 send-pack: do not give up when remote has insanely large number of refs.
32104 gitview: ls-remote invocation shellquote safety.
32105 pack-objects: thin pack micro-optimization.
32106 pack-objects: use full pathname to help hashing with "thin" pack.
32107 count-delta: tweak counting of copied source material.
32108 count-delta: fix counting of copied source.
32109 Tweak break/merge score to adjust to the new delta generation code.
32110 pack-objects: allow "thin" packs to exceed depth limits
32111 rev-list --objects-edge: remove duplicated edge commit output.
32112 rev-list --objects: use full pathname to help hashing.
32113 pack-objects: hash basename and direname a bit differently.
32114 Revert "diff-delta: produce optimal pack data"
32115 Build and install git-mailinfo.
32116 rev-list split: minimum fixup.
32117 apply --whitespace fixes and enhancements.
32118 apply: squelch excessive errors and --whitespace=error-all
32119 apply --whitespace: configuration option.
32120 git-apply --whitespace=nowarn
32121 Revert "Revert "diff-delta: produce optimal pack data""
32122 git-apply: war on whitespace -- finishing touches.
32123 diffcore-break: micro-optimize by avoiding delta between identical files.
32124 diffcore-rename: split out the delta counting code.
32125 diffcore-delta: stop using deltifier for packing.
32126 git-am: --whitespace=x option.
32127 diff-delta: cull collided hash bucket more aggressively.
32128 git-log (internal): add approxidate.
32129 git-log (internal): more options.
32130 Pretty-print tagger dates.
32131 war on whitespaces: documentation.
32132 Documentation: read-tree --aggressive
32133 Documentation: rev-list --objects-edge
32134 annotate: resurrect raw timestamps.
32135 setup_revisions(): handle -n<n> and -<n> internally.
32136 GIT-VERSION-GEN: squelch unneeded error from "cat version"
32137 show-branch --topics
32139 git-commit: make sure we protect against races.
32140 diffcore-rename: similarity estimator fix.
32141 show-branch --topics: omit more uninteresting commits.
32142 count-delta: no need for this anymore.
32143 diffcore-break: similarity estimator fix.
32144 diffcore-delta: make change counter to byte oriented again.
32145 git-commit --amend: allow empty commit.
32147 verify-pack -v: show delta-chain histogram.
32148 blame: avoid -lm by not using log().
32149 blame and annotate: show localtime with timezone.
32150 blame: avoid "diff -u0".
32151 annotate/blame tests updates.
32152 annotate-blame test: don't "source", but say "."
32153 annotate-blame test: add evil merge.
32154 blame: unbreak "diff -U 0".
32155 annotate-blame: tests incomplete lines.
32156 pack-objects: simplify "thin" pack.
32157 Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
32158 refs.c::do_for_each_ref(): Finish error message lines with "\n"
32159 fsck-objects: Remove --standalone
32160 Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
32161 try_to_simplify_commit(): do not skip inspecting tree change at boundary.
32162 repack: prune loose objects when -d is given
32163 git-diff: -p disables rename detection.
32164 diffcore-rename: somewhat optimized.
32165 revision traversal: --remove-empty fix.
32166 revision traversal: --remove-empty fix (take #2).
32167 diffcore-delta: make the hash a bit denser.
32168 diffcore-delta: tweak hashbase value.
32169 cvsimport: honor -i and non -i upon subsequent imports
32170 fetch: exit non-zero when fast-forward check fails.
32171 cvsimport: fix reading from rev-parse
32172 git-pull: run repo-config with dash form.
32173 unpack_delta_entry(): reduce memory footprint.
32174 generate-cmdlist: style cleanups.
32176 git-merge knows some strategies want to skip trivial merges
32177 http-fetch: nicer warning for a server with unreliable 404 status
32178 core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
32179 revamp git-clone (take #2).
32180 get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
32181 clone: record the remote primary branch with remotes/$origin/HEAD
32182 http-push.c: squelch C90 warnings.
32183 git-apply: do not barf when updating an originally empty file.
32184 rev-list --timestamp
32185 git-clone: typofix.
32186 git-pull: further safety while on tracking branch.
32187 git-pull: reword "impossible to fast-forward" message.
32188 sha1_name: warning ambiguous refs.
32189 sha1_name: make core.warnambiguousrefs the default.
32190 send-email: Identify author at the top when sending e-mail
32191 commit-tree: check return value from write_sha1_file()
32192 built-in diff: minimum tweaks
32193 true built-in diff: run everything in-core.
32194 git-push: make --thin pack transfer the default.
32195 add clean and ignore rules for xdiff/
32198 Karl Hasselström (7):
32199 git-svnimport: -r adds svn revision number to commit messages
32200 svnimport: Mention -r in usage summary
32201 svnimport: Convert executable flag
32202 svnimport: Convert the svn:ignore property
32203 svnimport: Read author names and emails from a file
32204 Let git-svnimport's author file use same syntax as git-cvsimport's
32205 Save username -> Full Name <email@addr.es> map file
32207 Linus Torvalds (21):
32208 Handling large files with GIT
32209 Handling large files with GIT
32210 git-merge-tree: generalize the "traverse <n> trees in sync" functionality
32211 Teach the "git" command to handle some commands internally
32212 First cut at libifying revlist generation
32213 Make git diff-generation use a simpler spawn-like interface
32214 The war on trailing whitespace
32215 Splitting rev-list into revisions lib, end of beginning.
32216 git-rev-list libification: rev-list walking
32217 Introduce trivial new pager.c helper infrastructure
32218 Tie it all together: "git log"
32219 Rip out merge-order and make "git log <paths>..." work again.
32220 get_revision(): do not dig deeper when we know we are at the end.
32221 git-fmt-merge-msg cleanup
32222 Fix up diffcore-rename scoring
32223 diffcore-delta: 64-byte-or-EOL ultrafast replacement.
32224 diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
32225 git-apply: safety fixes
32226 Use a *real* built-in diff generator
32227 builtin-diff: \No newline at end of file.
32228 Fix error handling for nonexistent names
32230 Lukas Sandström (1):
32231 git-fetch: print the new and old ref when fast-forwarding
32233 Marco Costalba (1):
32234 Add a Documentation/git-tools.txt
32237 imap-send: cleanup execl() call to use NULL sentinel instead of 0
32240 Let merge set the default strategy.
32243 combine-diff: Honour --full-index.
32244 combine-diff: Honour -z option correctly.
32245 Documentation/Makefile: Some `git-*.txt' files aren't manpages.
32246 gitignore: Ignore some more boring things.
32247 contrib/emacs/Makefile: Provide tool for byte-compiling files.
32248 annotate-tests: override VISUAL when running tests.
32250 Martin Langhoff (18):
32251 Introducing git-cvsserver -- a CVS emulator for git.
32252 cvsserver: add notes on how to get a checkout under Eclipse
32253 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
32254 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
32255 cvsserver: add notes on how to get a checkout under Eclipse
32256 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
32257 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
32258 cvsserver: Checkout correctly on Eclipse
32259 annotate: fix -S parameter to take a string
32260 cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
32261 cvsserver: checkout faster by sending files in a sensible order
32262 cvsserver: fix checkouts with -d <somedir>
32263 cvsserver: checkout faster by sending files in a sensible order
32264 cvsserver: fix checkouts with -d <somedir>
32265 cvsserver: nested directory creation fixups for Eclipse clients
32266 cvsserver: better error messages
32267 cvsserver: anonymous cvs via pserver support
32268 cvsserver: updated documentation
32271 gitk: Make error_popup react to Return
32273 Matthias Urlichs (2):
32274 cvsimport: Remove master-updating code
32275 Don't recurse into parents marked uninteresting.
32277 Mike McCormack (5):
32278 Allow adding arbitary lines in the mail header generated by format-patch.
32279 Allow format-patch to attach patches
32280 Document the --attach flag.
32281 Describe how to add extra mail header lines in mail generated by git-format-patch.
32282 Add git-imap-send, derived from isync 1.0.1.
32284 Nick Hengeveld (10):
32285 Update http-push functionality
32286 http-push: fix revision walk
32287 HTTP slot reuse fixes
32288 http-push: refactor remote file/directory processing
32289 http-push: improve remote lock management
32290 http-push: support for updating remote info/refs
32292 Fix broken slot reuse when fetching alternates
32293 http-push: add support for deleting remote branches
32294 http-push: don't assume char is signed
32296 Nicolas Pitre (11):
32297 relax delta selection filtering in pack-objects
32298 diff-delta: fold two special tests into one plus cleanups
32299 diff-delta: produce optimal pack data
32300 diff-delta: big code simplification
32301 diff-delta: bound hash list length to avoid O(m*n) behavior
32302 diff-delta: produce optimal pack data
32303 diff-delta: bound hash list length to avoid O(m*n) behavior
32304 diff-delta: allow reusing of the reference buffer index
32305 test-delta needs zlib to compile
32306 diff-delta: bound hash list length to avoid O(m*n) behavior
32307 3% tighter packs for free
32310 allow double click on current HEAD id after git-pull
32313 Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
32315 Paul Mackerras (13):
32316 gitk: Make "find" on "Files" work again.
32317 gitk: New improved gitk
32318 gitk: Fix clicks on arrows on line ends
32319 gitk: Fix Update menu item
32320 gitk: Various speed improvements
32321 gitk: Further speedups
32322 gitk: Fix a bug in drawing the selected line as a thick line
32323 gitk: Fix display of diff lines beginning with --- or +++
32324 gitk: Make commitdata an array rather than a list
32325 gitk: Don't change cursor at end of layout if find in progress
32326 gitk: Make downward-pointing arrows end in vertical line segment
32327 gitk: Improve appearance of first child links
32328 gitk: Fix two bugs reported by users
32331 gitview: Select the text color based on whether the entry in highlighted. Use standard font.
32334 Properly git-bisect reset after bisecting from non-master head
32335 Optionally do not list empty directories in git-ls-files --others
32337 Randal L. Schwartz (1):
32338 fix imap-send for OSX
32341 tar-tree: Use SHA1 of root tree for the basedir
32342 tar-tree: Introduce write_entry()
32343 tar-tree: Use write_entry() to write the archive contents
32344 tar-tree: Remove obsolete code
32345 tar-tree: Use the prefix field of a tar header
32348 send-email: Add some options for controlling how addresses are automatically added to the cc: list.
32349 send-email: Add --cc
32350 Add git-annotate, a tool for assigning blame.
32351 annotate: Handle dirty state and arbitrary revisions.
32352 annotate: Convert all -| calls to use a helper open_pipe().
32353 annotate: Use qx{} for pipes on activestate.
32354 annotate: handle \No newline at end of file.
32355 annotate: Add a basic set of test cases.
32356 annotate: Support annotation of files on other revisions.
32358 Sean Estabrooks (1):
32359 annotate.perl triggers rpm bug
32361 Shawn O. Pearce (7):
32362 git ls files recursively show ignored files
32363 Add missing programs to ignore list
32364 Darwin: Ignore missing /sw/lib
32365 Teach git-checkout-index to read filenames from stdin.
32366 Prevent --index-info from ignoring -z.
32367 Add --temp and --stage=all options to checkout-index.
32368 Add missing semicolon to sed command.
32371 Use setenv(), fix warnings
32374 fix warning from pack-objects.c
32375 Re-fix compilation warnings.
32376 annotate should number lines starting with 1
32377 fix field width/precision warnings in blame.c
32380 Be verbose when !initial commit
32383 Version v1.2.6; changes since v1.2.5:
32384 -------------------------------------
32386 Junio C Hamano (3):
32387 parse_date(): fix parsing 03/10/2006
32388 diff_flush(): leakfix.
32389 count-delta: match get_delta_hdr_size() changes.
32392 check patch_delta bounds more carefully
32395 Version v1.2.5; changes since v1.2.4:
32396 -------------------------------------
32399 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
32401 Junio C Hamano (3):
32402 read-tree --aggressive: remove deleted entry from the working tree.
32403 tar-tree: file/dirmode fix.
32404 safe_fgets() - even more anal fgets()
32406 Linus Torvalds (2):
32407 Fix Solaris stdio signal handling stupidities
32408 pack-objects: be incredibly anal about stdio semantics
32411 Version v1.2.4; changes since v1.2.3:
32412 -------------------------------------
32415 fix t5600-clone-fail-cleanup.sh on windows
32417 Josef Weidendorfer (2):
32418 git-mv: Allow -h without repo & fix error message
32419 git-mv: fixes for path handling
32421 Junio C Hamano (13):
32422 checkout - eye candy.
32423 Give no terminating LF to error() function.
32424 diffcore-rename: plug memory leak.
32425 git-am: do not allow empty commits by mistake.
32426 sample hooks template.
32427 apply --whitespace fixes and enhancements.
32428 apply: squelch excessive errors and --whitespace=error-all
32429 apply --whitespace: configuration option.
32430 git-apply --whitespace=nowarn
32431 git-apply: war on whitespace -- finishing touches.
32432 git-am: --whitespace=x option.
32433 diffcore-break: micro-optimize by avoiding delta between identical files.
32434 Allow git-mv to accept ./ in paths.
32436 Linus Torvalds (1):
32437 The war on trailing whitespace
32440 combine-diff: Honour --full-index.
32441 combine-diff: Honour -z option correctly.
32444 Version v1.2.3; changes since v1.2.2:
32445 -------------------------------------
32448 git-add: Add support for --, documentation, and test.
32449 git-push: Update documentation to describe the no-refspec behavior.
32451 Junio C Hamano (11):
32452 format-patch: pretty-print timestamp correctly.
32453 detect broken alternates.
32454 pack-objects: reuse data from existing packs.
32455 pack-objects: finishing touches.
32456 git-repack: allow passing a couple of flags to pack-objects.
32457 pack-objects: avoid delta chains that are too long.
32458 Make "empty ident" error message a bit more helpful.
32459 Delay "empty ident" errors until they really matter.
32460 Keep Porcelainish from failing by broken ident after making changes.
32461 pack-objects eye-candy: finishing touches.
32462 git-fetch: follow tag only when tracking remote branch.
32465 nicer eye candies for pack-objects
32466 also adds progress when actually writing a pack
32469 Version v1.2.2; changes since v1.2.1:
32470 -------------------------------------
32473 Trap exit to clean up created directory if clone fails.
32474 Abstract test_create_repo out for use in tests.
32475 Prevent git-upload-pack segfault if object cannot be found
32478 archimport: remove files from the index before adding/updating
32481 git-rev-parse: Fix --short= option parsing
32482 Document --short and --git-dir in git-rev-parse(1)
32485 Fix retries in git-cvsimport
32487 Shawn O. Pearce (1):
32488 Make git-reset delete empty directories
32491 Version v1.2.1; changes since v1.2.0:
32492 -------------------------------------
32494 Fernando J. Pereda (1):
32495 Print an error if cloning a http repo and NO_CURL is set
32497 Fredrik Kuivinen (1):
32498 s/SHELL/SHELL_PATH/ in Makefile
32500 Josef Weidendorfer (1):
32501 More useful/hinting error messages in git-checkout
32503 Junio C Hamano (6):
32504 Documentation: git-commit in 1.2.X series defaults to --include.
32505 Documentation: git-ls-files asciidocco.
32506 bisect: remove BISECT_NAMES after done.
32507 combine-diff: diff-files fix.
32508 combine-diff: diff-files fix (#2)
32509 checkout: fix dirty-file display.
32512 Version v1.2.0; changes since v1.1.6:
32513 -------------------------------------
32516 Add freebsd support in Makefile
32519 fix "test: 2: unexpected operator" on bsd
32520 avoid echo -e, there are systems where it does not work
32522 Andreas Ericsson (4):
32523 git-cvsimport: Add -A <author-conv-file> option
32524 update-hook: Major overhaul (handling tags, mainly).
32525 format-patch: Remove last vestiges of --mbox option
32526 .gitignore git-rerere and config.mak
32528 Christian Biesinger (1):
32529 Use a relative path for SVN importing
32531 Daniel Barkalow (4):
32532 Only use a single parser for tree objects
32533 Use struct tree in tar-tree
32534 Use struct commit in tar-tree
32535 Make apply accept the -pNUM option like patch does.
32537 Eric W. Biederman (1):
32538 Fix git-format-patch -s to include a Signed-off-by: line...
32541 rev-list: allow -n<n> as shorthand for --max-count=<n>
32542 rev-list: allow -<n> as shorthand for --max-count=<n>
32544 Florian Weimer (1):
32545 AsciiDoc fixes for the git-svnimport manpage
32547 Fredrik Kuivinen (2):
32548 merge-recursive: Make use of provided bases
32549 merge-recursive: Speed up commit graph construction
32551 J. Bruce Fields (7):
32552 Minor git-reset and git-commit documentation fixes
32553 Mention install-doc in INSTALL
32555 cvs-migration documentation update
32556 Docs: split up pull-fetch-param.txt
32557 Docs: move git url and remotes text to separate sections
32558 Docs: minor git-push copyediting
32561 Run GIT-VERSION-GEN with $(SHELL), not sh.
32562 Add compat/unsetenv.c .
32563 Use sha1_file.c's mkdir-like routine in apply.c.
32564 stat() for existence in safe_create_leading_directories()
32566 Johannes Schindelin (1):
32567 Use a hashtable for objects instead of a sorted list
32570 Add --diff-filter= documentation paragraph
32572 Junio C Hamano (112):
32573 show-branch: take default arguments from configuration file.
32574 git-describe: default to HEAD
32575 Makefile: add 'strip' target
32576 octopus: allow criss-cross and clarify the message when it rejects
32577 Fix the installation location.
32578 checkout: automerge local changes while switching branches.
32579 checkout: merge local modifications while switching branches.
32580 git-push: avoid falling back on pushing "matching" refs.
32581 checkout: show dirty state upon switching branches.
32582 clone: --naked option.
32583 format-patch: always --mbox and show sane Date:
32584 octopus: allow manual resolve on the last round.
32585 Documentation: show-branch.
32586 show-branch: make the current branch and merge commits stand out.
32587 show-branch: --current includes the current branch.
32588 cvsimport: ease migration from CVSROOT/users format
32589 git-push: fix --tags and document it.
32590 Allow building of RPM from interim snapshot.
32591 Revert "git-push: avoid falling back on pushing "matching" refs."
32592 Makefile: do not assume lack of IPV6 means no sockaddr_storage.
32593 fsck-objects: support platforms without d_ino in struct dirent.
32594 DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
32595 t4011: "sleep 1" is not enough on FAT
32596 Undef DT_* before redefining them.
32597 git-grep: clarification on parameters.
32598 Recommend to remove unused `origin` in a shared repository.
32599 Documentation: finishing touches to the new tutorial.
32600 sample update-hook: sanely handle a new branch head.
32601 git-clone: PG13 --naked option to --bare.
32602 clone: do not create remotes/origin nor origin branch in a bare repository.
32603 clone: do not accept more than one -o option.
32604 tests: adjust breakage by stricter rev-parse
32605 git-fetch --upload-pack: disambiguate.
32606 merge: seed the commit message with list of conflicted files.
32607 diff-tree -c: show a merge commit a bit more sensibly.
32608 diff-tree --cc: denser combined diff output for a merge commit.
32609 combine-diff: fix appending at the tail of a list.
32610 combine-diff: minor output changes.
32611 combine-diff: extend --cc logic to Octopus.
32612 diff-tree --cc: squelch header generation on empty patch.
32613 combine-diff: better hunk splitting.
32614 diff-files: -c and --cc options.
32615 rev-list --remove-empty: add minimum help and doc entry.
32616 abbrev cleanup: use symbolic constants
32617 rev-parse: --abbrev option.
32618 diff-tree: abbreviate merge parent object names with --abbrev --pretty.
32619 rev-parse --abbrev: do not try abbrev shorter than minimum.
32620 Rename rev-parse --abbrev to --short.
32621 pretty_print_commit(): pass commit object instead of commit->buffer.
32622 pretty_print_commit: honor grafts.
32623 diff --abbrev=<n> option fix.
32624 rev-parse: make "whatchanged -- git-fetch-script" work again.
32625 diff-files -c/--cc: combine only when both ours and theirs exist.
32626 Documentation: diff -c/--cc
32627 documentation: cvs migration - typofix.
32628 update-index --index-info: allow stage 0 entries.
32629 rev-list: omit duplicated parents.
32630 combine-diff: reuse diff from the same blob.
32631 combine-diff: update --cc "uninteresting hunks" logic.
32632 combine-diff: add safety check to --cc.
32633 combine-diff: fix placement of deletion.
32634 Documentation: git-diff-tree --cc also omits empty commits
32635 commit.c: "Merge" fix in pretty_print_commit.
32636 combine-diff: add a bit more comments.
32637 combine-diff: show parent line numbers as well.
32638 combine-diff: cleanup.
32639 combine-diff: finishing touches to git-diff-tree --cc
32640 whitespace cleanup.
32641 get_sha1_1: allow octopus^12 to be properly parsed.
32642 git-merge: Properly quote $merge_msg variable.
32643 Do not fall back on vi on dumb terminals.
32644 diff-index: make --cc a synonym for -p for now.
32645 git-diff: use --cc instead of -p.
32647 daemon: do not forbid user relative paths unconditionally under --base-path
32648 daemon: extend user-relative path notation.
32649 combine-diff: remove misguided --show-empty hack.
32650 git-diff-tree --stdin: show all parents.
32651 git-diff: do not fall back on --cc when -[123], --ours etc. are given.
32652 core-tutorial: adjust to recent reality.
32653 combine-diff: do not send NULL to printf
32654 combine-diff: show mode changes as well.
32655 combine-diff: do not punt on removed or added files.
32656 mailinfo: reset CTE after each multipart
32657 read-tree --aggressive
32658 fmt-merge-msg: show summary of what is merged.
32659 git-rerere: reuse recorded resolve.
32660 git-commit: revamp the git-commit semantics.
32661 git-commit: finishing touches.
32662 Do not allow empty name or email.
32663 t6000: fix a careless test library add-on.
32664 ls-files: honour per-directory ignore file from higher directories.
32665 combined-diff: use diffcore before intersecting paths.
32666 call git_config() after setup_git_directory()
32667 combine-diff: move formatting logic to show_combined_diff()
32668 count-delta.c: Match the delta data semantics change in version 3.
32670 find_unique_abbrev() simplification.
32671 combine-diff: Record diff status a bit more faithfully
32672 rev-list: default to abbreviate merge parent names under --pretty.
32673 git-commit -v: have patch at the end.
32674 Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
32675 fetch-clone progress: finishing touches.
32676 Only call git-rerere if $GIT_DIR/rr-cache exists.
32677 t5500: adjust to change in pack-object reporting behaviour.
32678 diff-tree: do not default to -c
32679 Avoid using "git-var -l" until it gets fixed.
32680 hashtable-based objects: minimum fixups.
32681 Make pack-objects chattier.
32682 git-commit: show dirtiness including index.
32683 Fix "test: unexpected operator" on bsd
32687 Add howto about separating topics.
32689 Linus Torvalds (14):
32690 Make git-rev-list and git-rev-parse argument parsing stricter
32691 git-whatchanged: exit out early on errors
32692 rev-list: stop when the file disappears
32693 Make the "struct tree_desc" operations available to others
32694 Make git-tar-tree use the tree_desc abstractions
32695 Fix git-rev-parse over-eager errors
32696 diff-tree --always flag
32697 rev-parse lstat() workaround cleanup.
32698 Fix "git diff a..b" breakage
32699 diff-tree -c raw output
32700 Make "git clone" less of a deathly quiet experience
32701 Make "git clone" pack-fetching download statistics better
32702 Fix fetch-clone in the presense of signals
32703 Fix object re-hashing
32706 daemon: Provide missing argument for logerror() call.
32707 http-fetch: Fix object list corruption in fill_active_slots().
32708 http-fetch: Fix message reporting rename of object file.
32709 http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
32710 http-fetch: Tidy control flow in process_alternate_response
32711 daemon: Set SO_REUSEADDR on listening sockets.
32712 http-fetch: Abort requests for objects which arrived in packs
32714 Martin Langhoff (3):
32715 cvsimport: Add -S <skipfileregex> support and -v announces files retrieved
32716 exportcommit: replace backticks with safe_pipe_capture() or system() - initial pass
32717 cvsexportcommit: add some examples to the documentation
32720 local push/pull env cleanup
32722 Michal Ostrowski (3):
32723 Exec git programs without using PATH.
32724 git-fetch: pass --upload-pack to fetch-pack
32725 git-{fetch,peek-remote} handling of --upload-pack
32727 Nick Hengeveld (2):
32728 Fix HTTP request result processing after slot reuse
32729 Use local structs for HTTP slot callback data
32732 remove delta-against-self bit
32733 count-delta.c: comment fixes
32734 delta micro optimization
32736 Paul Mackerras (2):
32737 gitk: Add braces around if expressions
32738 gitk: Use git-diff-tree --cc for showing the diffs for merges
32741 Disable USE_SYMLINK_HEAD by default
32742 Don't include ../README in git.txt - make a local copy
32745 Use adler32() from zlib instead of defining our own.
32748 Document git-ls-files --directory
32749 Allow diff and index commands to be interrupted
32750 Document git-diff-tree --always
32751 Basic documentation for git-show
32752 Add support for explicit type specifiers when calling git-repo-config
32755 Provide a more meaningful initial "From " line when using --compose in git-send-email.
32756 git-send-email: Add --quiet to reduce some of the chatter when sending emails.
32757 git-send-email: Fully implement --quiet and document it.
32759 Sasha Khapyorsky (1):
32760 git-svnimport.perl: fix for 'arg list too long...'
32763 Add --keep option to keep downloaded packs to git-fetch.
32766 update using-topic-branches
32768 Uwe Kleine-König (4):
32769 Fix generation of "humanish" part of source repo
32770 Remove unneeded header
32771 Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
32772 Make GIT-VERSION-GEN tolerate missing git describe command again
32775 Version v1.1.6; changes since v1.1.5:
32776 -------------------------------------
32778 Fredrik Kuivinen (2):
32779 merge-recursive: Improve the error message printed when merge(1) isn't found.
32780 git-branch: Documentation fixes
32782 J. Bruce Fields (1):
32783 git push -f documentation
32785 Junio C Hamano (1):
32786 pre-commit sample hook: do not barf on the initial import
32789 Version v1.1.5; changes since v1.1.4:
32790 -------------------------------------
32792 Junio C Hamano (1):
32793 checkout: do not make a temporary copy of symlink target.
32796 Version v1.1.4; changes since v1.1.3:
32797 -------------------------------------
32799 Johannes Schindelin (1):
32800 git-fetch-pack: really do not ask for funny refs
32802 Junio C Hamano (1):
32803 Revert "check_packed_git_idx(): check integrity of the idx file itself."
32806 Version v1.1.3; changes since v1.1.2:
32807 -------------------------------------
32809 Junio C Hamano (2):
32810 diffcore-break/diffcore-rename: integer overflow.
32811 describe: omit clearing marks on the last one.
32814 Version v1.1.2; changes since v1.1.1:
32815 -------------------------------------
32817 J. Bruce Fields (1):
32818 Documentation: clarify fetch parameter descriptions.
32820 Junio C Hamano (6):
32821 update-index: work with c-quoted name
32822 describe: do not silently ignore indescribable commits
32823 name-rev: do not omit leading components of ref name.
32824 show-branch: handle [] globs as well.
32825 Documentation: git-commit -a
32826 Documentation: git-reset - interrupted workflow.
32829 Add git-describe to .gitignore.
32832 Version v1.1.1; changes since v1.1.0:
32833 -------------------------------------
32835 H. Peter Anvin (1):
32836 For release tarballs, include the proper version
32838 Johannes Schindelin (1):
32839 glossary: explain "master" and "origin"
32841 Junio C Hamano (1):
32842 GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
32845 Version v1.1.0; changes since v1.0.13:
32846 --------------------------------------
32848 Johannes Schindelin (3):
32849 git-clone: Support changing the origin branch with -o
32850 Introduce core.sharedrepository
32851 git-init-db: initialize shared repositories with --shared
32854 Make GIT-VERSION-GEN tolerate missing git describe command
32856 Junio C Hamano (23):
32857 Post 1.0.0 development track.
32858 Versioning scheme changes.
32859 merge-recursive: conflicting rename case.
32860 whatchanged: customize diff-tree output
32861 rev-parse: --show-cdup
32862 check_packed_git_idx(): check integrity of the idx file itself.
32863 checkout: sometimes work from a subdirectory.
32864 ls-tree: chomp leading directories when run from a subdirectory
32865 git-clone: do not special case dumb http.
32866 Tutorial: mention shared repository management.
32867 git-describe: really prefer tags only.
32868 git-describe: use find_unique_abbrev()
32869 git-describe: --tags and --abbrev
32870 git-describe: still prefer annotated tag under --all and --tags
32871 git-describe: documentation.
32872 Makefile: use git-describe to mark the git version.
32873 send-pack/receive-pack: allow errors to be reported back to pusher.
32874 git-fetch: auto-following tags.
32875 ls-files --others --directory: fix a bug with index entry ordering
32876 ls-files --others --directory: give trailing slash
32877 git-status: use ls-files --others --directory for untracked list.
32878 ls-files --others --directory: test
32879 describe: allow more than one revs to be named.
32881 Linus Torvalds (2):
32882 Add a "git-describe" command
32883 ls-files -o: optionally skip showing the contents in "untracked" directories
32885 Lukas Sandström (1):
32886 git-pack-redundant: speed and memory usage improvements
32889 git-daemon --base-path
32891 YOSHIFUJI Hideaki (1):
32892 GIT: Support [address] in URLs
32895 Add an optional limit to git-cherry
32896 Add a minimal test for git-cherry
32897 Add a test for rebase when a change was picked upstream
32900 Version v1.0.13; changes since v1.0.12:
32901 ---------------------------------------
32903 Junio C Hamano (1):
32904 checkout: do not make a temporary copy of symlink target.
32907 Version v1.0.12; changes since v1.0.11:
32908 ---------------------------------------
32910 Johannes Schindelin (1):
32911 git-fetch-pack: really do not ask for funny refs
32913 Junio C Hamano (1):
32914 Revert "check_packed_git_idx(): check integrity of the idx file itself."
32917 Version v1.0.11; changes since v1.0.10:
32918 ---------------------------------------
32920 Junio C Hamano (1):
32921 diffcore-break/diffcore-rename: integer overflow.
32924 Version v1.0.10; changes since v1.0.9:
32925 --------------------------------------
32927 J. Bruce Fields (1):
32928 Documentation: clarify fetch parameter descriptions.
32930 Junio C Hamano (5):
32931 update-index: work with c-quoted name
32932 name-rev: do not omit leading components of ref name.
32933 show-branch: handle [] globs as well.
32934 Documentation: git-commit -a
32935 Documentation: git-reset - interrupted workflow.
32938 Version v1.0.9; changes since v1.0.8:
32939 -------------------------------------
32941 Johannes Schindelin (1):
32942 glossary: explain "master" and "origin"
32945 Version v1.0.8; changes since v1.0.7:
32946 -------------------------------------
32949 Substitute "/" with $opt_s in tag names as well as branch names
32951 Junio C Hamano (7):
32952 unpack-objects: default to quiet if stderr is not a tty.
32953 Retire debian/ directory.
32954 prune: do not show error from pack-redundant when no packs are found.
32955 Compilation: zero-length array declaration.
32956 tar-tree: finish honoring extractor's umask in git-tar-tree.
32957 revert/cherry-pick: handle single quote in author name.
32958 mailsplit: allow empty input from stdin
32961 Teach cvsexportcommit to add new files
32962 Fix typo in debug stanza of t2001
32963 Fix git-format-patch usage string wrt output modes.
32966 Version v1.0.7; changes since v1.0.6:
32967 -------------------------------------
32970 trivial: retval of waitpid is not errno
32971 trivial: O_EXCL makes O_TRUNC redundant
32972 fix potential deadlock in create_one_file
32973 use result of open(2) to check for presence
32974 trivial: typo in git-commit.sh
32975 trivial: clarify, what are the config's user.name and user.email about
32976 trivial: remove the dots at the end of file names from merge-one-file
32977 trivial: use git-repo-config to detect if the test can be run on the repository
32978 trivial: use git-repo-config to detect how to run tests in the test repository
32979 trivial: .gitignore precompiled python modules
32980 trivial: check, if t/trash directory was successfully created
32981 use GIT_DIR instead of /var/tmp
32983 Amos Waterland (1):
32984 AIX compile fix for repo-config.c
32986 Andreas Ericsson (1):
32987 git: grok 'help' to mean '--help'.
32990 svnimport: support repositories requiring SSL authentication
32991 Documentation/git-svnimport: document -T and -t switches correctly
32994 Fix skipping merge-order test with NO_OPENSSL=1.
32997 Fix git-symbolic-ref typo in git.txt.
33000 git-init-db(1): Describe --shared and the idempotent nature of init-db
33001 Wrap synopsis lines and use [verse] to keep formatting
33003 Junio C Hamano (6):
33004 Documentation: spell.
33005 code comments: spell
33006 ?alloc: do not return NULL when asked for zero bytes
33007 git-fetch --tags: reject malformed tags.
33008 format-patch/commit: Quote single quote in the author name properly.
33009 t3300: skip when filesystem does not like TAB in filenames.
33011 Linus Torvalds (1):
33012 Fix nasty approxidate bug
33015 Version v1.0.6; changes since v1.0.5:
33016 -------------------------------------
33018 Junio C Hamano (3):
33019 Guard a test against wc that pads its output with whitespace
33020 Fix bogus tests on rev-list output.
33021 Do not mark tags fetched via --tags flag as mergeable
33024 copy_fd: close ifd on error
33027 Version v1.0.5; changes since v1.0.4:
33028 -------------------------------------
33031 short circuit out of a few places where we would allocate zero bytes
33033 Johannes Schindelin (1):
33034 Handle symlinks graciously
33036 Junio C Hamano (2):
33037 avoid asking ?alloc() for zero bytes.
33038 t5300: avoid false failures.
33041 Version v1.0.4; changes since v1.0.3:
33042 -------------------------------------
33044 Junio C Hamano (5):
33045 check_packed_git_idx(): check integrity of the idx file itself.
33046 show-branch: usability updates.
33047 merge --no-commit: tweak message
33048 ls-files --full-name: usage string and documentation.
33049 mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
33052 Version v1.0.3; changes since v1.0.2:
33053 -------------------------------------
33056 \n usage in stderr output
33058 Johannes Schindelin (2):
33059 git-format-patch should show the correct version
33060 sha1_to_hex: properly terminate the SHA1
33062 Junio C Hamano (1):
33063 send-pack: reword non-fast-forward error message.
33065 Nick Hengeveld (1):
33066 Fix for http-fetch from file:// URLs
33069 sanity check in add_packed_git()
33072 Version v1.0.2; changes since v1.0.1:
33073 -------------------------------------
33075 Junio C Hamano (1):
33076 server-info: skip empty lines.
33079 quote.c: Make loop control more readable.
33082 Version v1.0.1; changes since v1.0.0b:
33083 --------------------------------------
33086 Version v1.0.0b; changes since v1.0.0a:
33087 ---------------------------------------
33089 Junio C Hamano (1):
33090 server-info: skip empty lines.
33093 quote.c: Make loop control more readable.
33096 Version v1.0.0a; changes since v1.0.0:
33097 --------------------------------------
33099 Johannes Schindelin (1):
33100 Avoid misleading success message on error
33102 Junio C Hamano (3):
33103 objects/info/packs: work around bug in http-fetch.c::fetch_indices()
33104 http-fetch.c: fix objects/info/pack parsing.
33108 An off-by-one bug found by valgrind
33111 Version v1.0.0; changes since v1.0rc6:
33112 --------------------------------------
33115 Documentation/git-archimport: document -o, -a, f, -D options
33117 Fredrik Kuivinen (3):
33118 git-diff: Usage string clean-up
33119 git-log: Add usage string
33120 git-whatchanged: Add usage string
33125 Johannes Schindelin (1):
33126 We do not like "HEAD" as a new branch name
33128 Junio C Hamano (32):
33129 clone-pack: make it usable for partial branch cloning.
33130 Documentation: tutorial
33131 get_sha1_basic(): corner case ambiguity fix
33133 Sort globbed refname in show-branch.
33134 refs.c: off-by-one fix.
33135 Examples of resetting.
33136 Forbid pattern maching characters in refnames.
33138 Documentation: HTTP needs update-server-info.
33139 Remove misguided branch disambiguation.
33140 Revert "refs.c: off-by-one fix."
33141 Revert "We do not like "HEAD" as a new branch name"
33142 Revert "get_sha1_basic(): corner case ambiguity fix"
33143 fetch-pack: -k option to keep downloaded pack.
33144 clone-pack: remove unused and undocumented --keep flag
33145 Documentation: typos and small fixes in "everyday".
33146 howto/using-topic-branches: Recommend public URL git://git.kernel.org/
33147 rev-list --objects: fix object list without commit.
33148 Documentation: stdout of update-hook is connected to /dev/null
33149 Remove generated files */*.py[co]
33150 Remove unused cmd-rename.sh
33152 tests: make scripts executable
33153 xread/xwrite: do not worry about EINTR at calling sites.
33154 diff: --abbrev option
33155 diff --abbrev: document --abbrev=<n> form.
33156 format-patch: make sure header and body are separated.
33159 ce_smudge_racily_clean_entry: explain why it works.
33160 A shared repository should be writable by members.
33162 Linus Torvalds (3):
33163 Make "git help" react to window size correctly
33164 Make "git help" sort git commands in columns
33165 Make "git-send-pack" less verbose by default
33167 Martin Langhoff (1):
33168 svnimport: exit cleanly when we are up to date
33171 small cleanup for diff-delta.c
33174 Version v1.0rc6; changes since v1.0rc5:
33175 ---------------------------------------
33177 Amos Waterland (1):
33178 git rebase loses author name/email if given bad email address
33180 Fredrik Kuivinen (12):
33181 Usage message clean-up, take #2
33182 Trivial usage string clean-up
33183 git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
33184 git-revert: Usage string clean-up
33185 git-am: Usage string clean-up
33186 git-applypatch: Usage string clean-up, emit usage string at incorrect invocation
33187 git-cherry: Usage string clean-up, use the 'usage' function
33188 git-fetch: Usage string clean-up, emit usage string at unrecognized option
33189 git-lost-found: Usage string clean-up, emit usage string at incorrect invocation
33190 git-prune: Usage string clean-up, use the 'usage' function
33191 git-rebase: Usage string clean-up, emit usage string at incorrect invocation
33192 git-repack: Usage string clean-up, emit usage at incorrect invocation
33194 H. Peter Anvin (1):
33195 git-am support for naked email messages (take 2)
33197 Junio C Hamano (22):
33198 diffcore-break.c: check diff_delta() return value.
33199 Add deltifier test.
33200 diff-delta.c: allow delta with empty blob.
33201 Everyday: some examples.
33202 Revert "diff-delta.c: allow delta with empty blob."
33203 Revert "Add deltifier test."
33204 diffcore-break: do not break too small filepair.
33205 Everyday: a bit more example.
33206 Documentation: more examples.
33207 Documentation: fix missing links to git(7)
33208 Documentation: diff examples.
33209 Documentation: not learning core git commands.
33210 git-clone: tell the user a bit more about clone-pack failure.
33211 allow merging any committish
33212 checkout-index: fix checking out specific path.
33213 Everyday: a bit more examples.
33214 t3200: branch --help does not die anymore.
33215 applypatch: no need to do non-portable [[ ... ]]
33216 Documentation: topic branches
33217 rebase: do not get confused in fast-forward situation.
33218 Do not let errors pass by unnoticed when running `make check'.
33219 mailinfo and git-am: allow "John Doe <johndoe>"
33221 Lukas Sandström (1):
33222 Bugfixes for git-rebase
33224 Martin Atukunda (1):
33225 define MAXPATHLEN for hosts that don't support it
33228 Make git-send-pack exit with error when some refs couldn't be pushed out
33231 Version v1.0rc5; changes since v1.0rc4:
33232 ---------------------------------------
33235 use "git init-db" in tests
33237 Daniel Barkalow (3):
33238 Warn when send-pack does nothing
33239 Clean up file descriptors when calling hooks.
33240 Allow saving an object from a pipe
33243 archimport: first, make sure it still compiles
33244 archimport: remove String::ShellQuote dependency.
33245 archimport: fix -t tmpdir switch
33246 archimport: remove git wrapper dependency
33247 archimport: add -D <depth> and -a switch
33248 archimport: safer log file parsing
33249 archimport: Add the accurate changeset applyer
33250 archimport: Fix a bug I introduced in the new log parser
33251 archimport: fix a in new changeset applyer addition
33254 Document config.mak in INSTALL.
33255 Initial AIX portability fixes.
33256 Use printf rather than echo -n.
33259 Added documentation for few missing options.
33261 Junio C Hamano (51):
33262 compat/setenv: do not free what we fed putenv(3).
33263 git.c: two fixes, gitsetenv type and off-by-one error.
33264 show-branch: allow glob pattern to name branches to show.
33265 Documentation: rebase does not use cherry-pick anymore.
33266 struct tree: remove unused field "parent"
33267 git.c: remove excess output for debugging when command is too long.
33268 sha1_file.c: make sure packs in an alternate odb is named properly.
33269 server-info.c: drop unused D lines.
33270 server-info: stop sorting packs by latest date.
33271 server-info: throw away T computation as well.
33272 Documentation: talk about pathspec in bisect.
33273 Documentation: git-mv manpage workaround.
33274 Documentation: git-diff asciidoc table workaround.
33275 Documentation: push/receive hook references.
33276 Documentation: shared repository management in tutorial.
33277 server-info.c: use pack_local like everybody else.
33278 server-info.c: and two functions are not used anymore.
33279 config.c: remove unnecessary header in minimum configuration file.
33280 Clean up compatibility definitions.
33282 git-mv to work with Perl 5.6
33283 hash-object: -- and --help
33284 init-db: check extra arguments and complain.
33285 write-tree: check extra arguments and die but be a bit more helpful.
33286 Documentation: hash-object.
33287 Documentaiton (read-tree): update description of 3-way
33288 git-merge-one-file: resurrect leading path creation.
33289 qsort() ptrdiff_t may be larger than int
33290 checkout-index: allow checking out from higher stages.
33291 git-merge-one: new merge world order.
33292 update-index: allow --index-info to add higher stages.
33293 Documentation: git.html/git.7
33294 Documentation(glossary): minor formatting clean-ups.
33295 Documentation(cvs-migration): minor cleanups.
33296 Documentation(tutorial): adjust merge example to the new merge world order.
33297 refs.c: make sure leading directories exist before writing a ref.
33298 Make sure we use compat/subprocess.py with Python 2.3 while running tests.
33299 Documentation: recursive is the default strategy these days.
33300 show-branch: comment typo
33301 Documentation: git-prune
33302 qsort(): ptrdiff_t may be larger than int
33303 git-prune: never lose objects reachable from our refs.
33304 Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
33305 Everyday GIT with 20 commands
33306 Link Everyday GIT to main documentation tree.
33307 t3300: funny name test
33308 t0000: catch trivial pilot errors.
33309 format-patch: use same number of digits in numbers
33310 merge-recursive: leave unmerged entries in the index.
33311 merge-recursive: cleanup setIndexStages
33312 t/t6022: a new test for renaming merge.
33314 Nikolai Weibull (16):
33315 Document the --non-empty command-line option to git-pack-objects.
33316 Fix the description of --utf8 and --keep to git-am.
33317 Use uniform description for the '--' option.
33318 Documentation/git-commit.txt: Add long options and -- to documentation.
33319 Documentation/git-verify-pack.txt: added documentation for --.
33320 Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.
33321 Documentation/git-cherry-pick: Add --replay and --no-commit.
33322 Add documentation for git-revert and git-cherry-pick.
33323 Add documentation for the --topo-order option to git-show-branch.
33324 Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
33325 Documentation/git-ls-remote.txt: Add -h and -t.
33326 Documentation/git-repack.txt: Add -l and -n.
33327 Documentation/git-http-fetch.txt: Document the commit-id argument.
33328 Documentation/git-update-server-info.txt: Add -f alias for --force to documentation.
33329 Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS).
33330 Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.
33332 Paul Mackerras (3):
33333 gitk: Factored out some common code into a new start_rev_list procedure
33334 gitk: Some improvements for the code for updating the display
33335 gitk: Work around Tcl's non-standard names for encodings
33338 Update the git-ls-tree documentation
33339 Document the --(no-)edit switch of git-revert and git-cherry-pick
33341 Sven Verdoolaege (1):
33342 gitk: add Update menu item.
33345 Version v1.0rc4; changes since v1.0rc3:
33346 ---------------------------------------
33349 Documentation/git-log.txt: trivial typo fix.
33352 speedup allocation in pack-redundant.c
33353 remove unused variable
33354 arguments cleanup and some formatting
33355 Add tests for git-mv in subdirectories
33356 git wrapper: more careful argument stuffing
33358 Alexander Litvinov (1):
33359 git-mv is not able to handle big directories
33361 Andreas Ericsson (13):
33362 git-daemon: --inetd implies --syslog
33363 C implementation of the 'git' program, take two.
33364 Update git(7) man-page for the C wrapper.
33365 git --help COMMAND brings up the git-COMMAND man-page.
33366 daemon.c: fix arg parsing bugs
33367 Library code for user-relative paths, take three.
33368 Server-side support for user-relative paths.
33369 Client side support for user-relative paths.
33370 Documentation update for user-relative paths.
33371 git-reset.txt: Small fix + clarifications.
33372 git-daemon support for user-relative paths.
33373 Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.
33374 cvsimport: Don't let local settings hinder cvs user-migration.
33377 remove shellquote usage for tags
33378 archimport: don't die on merge-base failure
33379 Disambiguate the term 'branch' in Arch vs git
33381 Frank Sorenson (1):
33382 gitk: Specify line hover font
33384 Fredrik Kuivinen (5):
33385 merge-recursive: Replace 'except:'
33386 git-merge: Exit with code 2 if no strategy was able to handle the merge.
33387 test-lib.sh: Add new function, test_expect_code
33388 New test case: merge with directory/file conflicts
33389 New test case: Criss-cross merge
33391 H. Peter Anvin (3):
33392 git-core-foo -> git-foo, except the core package
33393 rename/copy score parsing updates.
33394 A few more options for git-cat-file
33397 Fix typo in http-push.c
33400 Add compat/setenv.c, use in git.c.
33403 gitk: put braces around exprs
33405 Johannes Schindelin (13):
33406 Add config variable core.symrefsonly
33407 Fix tests with new git in C
33408 Give python a chance to find "backported" modules
33409 Add functions git_config_set() and git_config_set_multivar()
33410 Add git-config-set, a simple helper for scripts to set config variables
33411 Add documentation for git-config-set
33412 Add test case for git-config-set
33413 git-config-set: add more options
33414 git-config-set: support selecting values by non-matching regex
33415 git-config-set: Properly terminate strings with '\0'
33416 Allow hierarchical section names
33417 Rename git-config-set to git-repo-config
33418 Make git-mv work in subdirectories, too
33421 Fix typos and minor format issues.
33424 Fix git(1) link to git-index-pack
33426 Josef Weidendorfer (6):
33427 Fix git-mv for moving directories with 1 file
33428 git-mv: shrink usage, no usage on error
33429 git-mv: keep git index consistent with file system on failed rename
33430 git-mv: fully detect 'directory moved into itself'
33431 Small fixes in Documentation/git-mv.txt
33432 git-mv: follow -k request even on failing renames
33434 Junio C Hamano (108):
33435 Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.
33436 diff: make default rename detection limit configurable.
33437 sha1_file.c::add_packed_git(): fix type mismatch.
33438 git wrapper: basic fixes.
33439 git-apply: fail if a patch cannot be applied.
33440 git-am: --resolved.
33441 apply: allow-binary-replacement.
33443 tests: binary diff application.
33444 Add approxidate test calls.
33445 Deal with binary diff output from GNU diff 2.8.7
33446 git-am: --binary; document --resume and --binary.
33447 git-prune: quote possibly empty $dryrun as parameter to test
33448 Cygwin *might* be helped with NO_MMAP
33449 Do not show .exe in git command list.
33450 git-branch: -f to forcibly reset branch head.
33451 Rewrite rebase to use git-format-patch piped to git-am.
33452 readrefs: grab all refs with one call to ls-remote.
33453 git-count-objects: dc replacement
33454 git-repack: do not do complex redundancy check.
33455 Documentation: rebase-from-internal minor updates.
33456 merge-one-file: remove empty directories
33457 merge-recursive::removeFile: remove empty directories
33458 http.c: reorder to avoid compilation failure.
33459 Do not DWIM in userpath library under strict mode.
33460 Documentation: add hooks/update example.
33461 merge-one-file: use rmdir -p
33462 Fix "do not DWIM" patch to enter_repo"
33463 Make sure heads/foo and tags/foo do not confuse things.
33464 Fix hooks/update template.
33465 format-patch: fix two-argument special case, and make it easier to pick single commits
33466 rename detection with -M100 means "exact renames only".
33467 tutorial: setting up a tree for subsystem maintainers
33468 daemon: further tweaks.
33470 Move diff.renamelimit out of default configuration.
33471 git-var: constness and globalness cleanup.
33472 pack-redundant: type cleanups.
33473 git-merge: make recursive the default strategy
33474 git-revert: make --edit default.
33475 Teach update-index to read from ls-tree.
33476 diff-tree: teach single-commit diff-tree to honour grafts
33477 config.c: avoid shadowing global.
33478 Prevent "git-commit -a path1 path2..."
33479 parse-remote and ls-remote clean-up.
33480 git-sh-setup: die if outside git repository.
33481 git-var: make it work in subdirectory.
33482 setup_git_directory: make sure GIT_DIR is a valid repository.
33483 git-sh-setup: move the repository check to a core program.
33484 shell.c: complain on insufficient arguments.
33485 name-rev: fix off-by-one error in --stdin.
33486 format-patch: output filename reported to stdout verbatim.
33487 Repository format version check.
33488 Check repository format version in enter_repo().
33489 init-db: check template and repository format.
33490 setup_git_directory(): check repository format version.
33491 Introduce i18n.commitencoding.
33492 mailinfo: allow -u to fall back on latin1 to utf8 conversion.
33493 mailinfo: Use i18n.commitencoding
33494 mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>
33495 config.c: constness tightening to avoid compilation warning.
33496 gitk: Use i18n.commitencoding configuration item.
33497 git-mv: quote $src in regexp properly.
33498 rebase: one safety net, one bugfix and one optimization.
33499 name-rev: fix parent counting.
33500 Documentation: Describe merge operation a bit better.
33501 write_name_quoted(): make one of the path a counted string.
33502 ls-tree: Resurrect funny name quoting lost during rewrite.
33503 ls-tree: match the test to the new semantics.
33504 bisect: quote pathnames for eval safety.
33505 working from subdirectory: preparation
33506 git-apply: work from subdirectory.
33507 peek-remote: honor proxy config even from subdirectory.
33508 fsck-objects: work from subdirectory.
33509 checkout-index: work from subdirectory.
33510 hash-object: work within subdirectory.
33511 ls-tree: work from subdirectory.
33512 Make networking commands to work from a subdirectory.
33513 Make the rest of commands work from a subdirectory.
33514 count-objects: make it operable from a subdirectory.
33515 ls-remote: define die() now we do not use git-sh-setup
33516 branch: make it operable from a subdirectory.
33517 lost-found: make it operable from a subdirectory.
33518 tag: make it operable from a subdirectory.
33519 verify-tag: make it operable from a subdirectory.
33520 define die() for scripts that use it.
33521 hash-object.c: type-fix to squelch compiler warnings.
33522 applymbox: typofix to enable -m option.
33523 applypatch: use "index" lines not "applies-to".
33524 format-patch: remove applies-to.
33525 format-patch: do not abuse 3-dash marker line.
33526 format-patch: run diff in C locale
33527 git-diff: do not turn off -p/-M with any diff options.
33528 diff-files: show diffs with stage0 and unmerged stage at the same time.
33529 merge-recursive: match the unmerged index entry behaviour with merge-resolve
33530 Tutorial: adjust merge example to recursive strategy.
33531 Documentation: describe '-f' option to git-fetch.
33532 Makefile: say the default target upfront.
33533 ls-tree: resurrect '-d' to mean 'show trees only'
33534 ls-tree: --name-only
33535 git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
33536 merge-recursive: adjust git-ls-tree use for the latest.
33537 t3100: add ls-tree -t and -d tests.
33538 merge-one-file: make sure we create the merged file.
33539 merge-one-file: make sure we do not mismerge symbolic links.
33540 git-merge documentation: conflicting merge leaves higher stages in index
33541 documentation: git-bisect (help HTML break man)
33542 daemon.c and path.enter_repo(): revamp path validation.
33545 git-cvsexportcommit.perl: Fix usage() output.
33546 git-cvsexportcommit.perl: use getopts to get binary flags
33547 git-cvsexportcommit.perl: exit with non-0 status if patch fails.
33548 git-cvsexportcommit.perl: fix typos in output
33550 Linus Torvalds (14):
33551 Disallow empty pattern in "git grep"
33552 git's rev-parse.c function show_datestring presumes gnu date
33553 Teach "approxidate" about weekday syntax
33554 Make "git fetch" less verbose by default
33555 Teach "approxidate" about weekday syntax
33556 git-repack: Properly abort in corrupt repository
33557 Allow editing of a revert-message
33558 ls-tree: major rewrite to do pathspec
33559 ls-tree: further cleanup to parallel ls-files.
33560 ls-tree: further tweaks of the rewrite
33561 bisect: limit the searchspace by pathspecs
33562 diff-files: -1/-2/-3 to diff against unmerged stage.
33563 merge-one-file: leave unmerged index entries upon automerge failure.
33564 git-ls-tree: add "-t" option to always show the tree entries
33567 max-count in terms of intersection
33569 Lukas Sandström (8):
33570 Fix llist_sorted_difference_inplace in git-pack-redundant
33571 Make git-pack-redundant non-horribly slow on large sets of packs
33572 Fix bug introduced by the latest changes to git-pack-redundant
33573 Fix a bug in get_all_permutations.
33574 Remove all old packfiles when doing "git repack -a -d"
33575 Improve the readability of git-pack-redundant
33576 Document the "ignore objects" feature of git-pack-redundant
33577 Make git-pack-redundant take a list of unimportant objs on stdin
33579 Martin Langhoff (1):
33580 archimport: allow for old style branch and public tag names
33582 Matthias Urlichs (1):
33583 SVN import: Use one log call
33585 Nick Hengeveld (7):
33586 Isolate shared HTTP request functionality
33587 Make http-fetch request types more clear
33588 Improve pack list response handling
33589 Improve XML parsing in http-push
33590 http-push memory/fd cleanup
33591 Decide whether to build http-push in the Makefile
33595 'make clean' forgot about some files
33598 proxy-command support for git://
33600 Paul Mackerras (5):
33601 Add -r flag and some speedups
33602 gitk: Fix some bugs introduced by speedup changes
33603 gitk: Disable fastdate stuff for now
33604 gitk: Fix diff this->selected and selected->this functions
33605 gitk: Add a preferences dialog with some basic stuff
33608 git-daemon not listening when compiled with -DNO_IPV6
33609 Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
33612 symref support for import scripts
33613 gitk: use git-diff-tree --no-commit-id
33614 gitk: UTF-8 support
33615 git-clone --shared should imply --local
33618 Fix bunch of fd leaks in http-fetch
33621 git-repack: Fix variable name
33624 Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY
33627 git-fsck-objects: Free tree entries after use
33628 Rework object refs tracking to reduce memory usage
33630 Stefan-W. Hahn (1):
33631 gitk: moving all three panes if clicking on an arrow.
33634 Fix sparse warnings
33635 Move couple of ifdefs after "include config.mk"
33637 Tommi Virtanen (1):
33638 Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
33641 Update pull/fetch --tags documentation
33643 YOSHIFUJI Hideaki (2):
33644 GIT: Fix compilation error in connect.c
33645 Fix a warning about unused value.
33648 Fix gitk this->selected diffs
33651 documentation: clarify read-tree --reset
33652 documentation: git-tag
33655 Version v1.0rc3; changes since v1.0rc2:
33656 ---------------------------------------
33658 Junio C Hamano (1):
33659 GIT 0.99.9j aka 1.0rc3
33662 Version v1.0rc2; changes since v1.0rc1:
33663 ---------------------------------------
33666 allow git-update-ref create refs with slashes in names
33668 Andreas Ericsson (1):
33669 git-branch: Mention -d and -D in man-page.
33671 Josef Weidendorfer (2):
33672 Bugfix: stop if directory already exists
33673 Remove git-rename. git-mv does the same
33675 Junio C Hamano (5):
33676 Debian: build-depend on libexpat-dev.
33677 Rename lost+found to lost-found.
33678 Separate LDFLAGS and CFLAGS.
33679 apply: fix binary patch detection.
33680 Update topo-order test.
33683 Fix compilation warnings in pack-redundant.c
33685 Linus Torvalds (1):
33686 Fix git-rev-list "date order" with --topo-order
33688 Matthias Urlichs (3):
33689 debian packaging: git-cvs needs cvsps
33690 Remove trailing slashes
33691 Depend on asciidoc 7 (at least).
33693 Nick Hengeveld (2):
33694 Fix for multiple alternates requests in http-fetch
33695 Fix fd leak in http-fetch
33697 Nikolai Weibull (3):
33698 Document the -n command-line option to git-unpack-objects
33699 Document a couple of missing command-line options.
33700 Documentation nitpicking
33702 Thomas Matysik (2):
33703 Add expat and expat-devel dependencies (for http-push) to RPM spec.
33704 Split gitk into seperate RPM package