aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'Junio C Hamano2014-12-22
|\
| * for-each-ref: correct spelling of Tcl in option descriptionRalf Thielow2014-11-30
* | Merge branch 'rj/t0050-passes'Junio C Hamano2014-12-22
|\ \
| * | t0050-*.sh: mark the rename (case change) test as passingRamsay Jones2014-11-30
* | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-22
|\ \ \
| * | | t5516: more tests for receive.denyCurrentBranch=updateInsteadJunio C Hamano2014-11-30
| * | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-30
* | | | Merge branch 'jc/exec-cmd-system-path-leak-fix'Junio C Hamano2014-12-22
|\ \ \ \
| * | | | system_path(): always return free'able memory to the callerJunio C Hamano2014-11-30
| | |_|/ | |/| |
* | | | Merge branch 'mh/find-uniq-abbrev'Junio C Hamano2014-12-22
|\ \ \ \
| * | | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevMike Hommey2014-11-26
* | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-22
|\ \ \ \ \
| * | | | | git-send-email: add --transfer-encoding optionPaolo Bonzini2014-11-25
| * | | | | git-send-email: delay creation of MIME headersPaolo Bonzini2014-11-25
* | | | | | Merge branch 'pb/am-message-id-footer'Junio C Hamano2014-12-22
|\ \ \ \ \ \
| * | | | | | git-am: add --message-id/--no-message-idPaolo Bonzini2014-11-25
| * | | | | | git-mailinfo: add --message-idPaolo Bonzini2014-11-25
| |/ / / / /
* | | | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-22
|\ \ \ \ \ \
| * | | | | | sort_string_list(): rename to string_list_sort()Michael Haggerty2014-11-25
| * | | | | | prune_remote(): iterate using for_each_string_list_item()Michael Haggerty2014-11-25
| * | | | | | prune_remote(): rename local variableMichael Haggerty2014-11-25
| * | | | | | repack_without_refs(): make the refnames argument a string_listMichael Haggerty2014-11-25
| * | | | | | prune_remote(): sort delete_refs_list references en masseMichael Haggerty2014-11-25
| * | | | | | prune_remote(): initialize both delete_refs lists in a single loopMichael Haggerty2014-11-25
| * | | | | | prune_remote(): exit early if there are no stale referencesMichael Haggerty2014-11-25
* | | | | | | Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-l...Junio C Hamano2014-12-22
|\ \ \ \ \ \ \
| * | | | | | | git-sh-setup.sh: use dashdash with basename callDan Wyand2014-11-25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rj/no-xopen-source-for-cygwin'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \
| * | | | | | | git-compat-util.h: don't define _XOPEN_SOURCE on cygwinRamsay Jones2014-11-24
| |/ / / / / /
* | | | | | | Merge branch 'js/t5000-dont-copy-bin-sh'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \
| * | | | | | | t5000 on Windows: do not mistake "sh.exe" as "sh"Johannes Sixt2014-11-24
| |/ / / / / /
* | | | | | | Merge branch 'jc/refer-to-t-readme-from-submitting-patches'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \
| * | | | | | | t/README: justify why "! grep foo" is sufficientJunio C Hamano2014-11-24
| * | | | | | | SubmittingPatches: refer to t/README for testsJunio C Hamano2014-11-24
* | | | | | | | Merge branch 'tb/config-core-filemode-check-on-broken-fs'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \
| * | | | | | | | init-db: improve the filemode trustability checkTorsten Bögershausen2014-11-21
* | | | | | | | | Merge branch 'mg/add-ignore-errors'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: ignore only ignored filesMichael J Gruber2014-11-21
* | | | | | | | | | Merge branch 'jk/lock-ref-sha1-basic-return-errors'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lock_ref_sha1_basic: do not die on locking errorsRonnie Sahlberg2014-11-20
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | trailer: add test with an old style conflict blockChristian Couder2014-11-10
| * | | | | | | | | | trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2014-11-10
| * | | | | | | | | | commit: make ignore_non_trailer() non staticChristian Couder2014-11-10
| * | | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano2014-10-28
| | * | | | | | | | | | builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano2014-10-28
| | * | | | | | | | | | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-24
| | * | | | | | | | | | builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-24
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Sync with v2.2.1Junio C Hamano2014-12-18
|\ \ \ \ \ \ \ \ \ \ \